Allow ipkg to handle conffiles if present (#3466)
[openwrt/openwrt.git] / tools / mtd-utils / patches / 100-gcc4_fix.patch
1 diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h
2 --- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200
3 +++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200
4 @@ -19,8 +19,6 @@
5 #undef je32_to_cpu
6 #undef jemode_to_cpu
7
8 -extern int target_endian;
9 -
10 #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
11 #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
12
13 diff -urN mtd.old/util/jffs3.h mtd.dev/util/jffs3.h
14 --- mtd.old/util/jffs3.h 2005-01-22 00:00:13.000000000 +0100
15 +++ mtd.dev/util/jffs3.h 2005-07-17 17:48:24.000000000 +0200
16 @@ -177,8 +177,6 @@
17 #undef je32_to_cpu
18 #undef jemode_to_cpu
19
20 -extern int target_endian;
21 -
22 #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
23 #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
24