X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=tools%2Fmtd-utils%2Fpatches%2F110-portability.patch;fp=tools%2Fmtd-utils%2Fpatches%2F110-portability.patch;h=c4cdab928aea66b3d4beeeb5629aac1ead87ed7f;hp=4ad209a449191bfec3d54fb7dc349af06d039051;hb=e27c8bb15651f8b5dfd5732306e26e6fa8cb0c0a;hpb=3fd67b7f41785cbe84f8dfae2cdfa0d8ec8652fd diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch index 4ad209a449..c4cdab928a 100644 --- a/tools/mtd-utils/patches/110-portability.patch +++ b/tools/mtd-utils/patches/110-portability.patch @@ -150,27 +150,6 @@ #include #include "version.h" -@@ -117,11 +116,6 @@ extern "C" { - fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \ - } while(0) - --#if defined(__UCLIBC__) --/* uClibc versions before 0.9.34 don't have rpmatch() */ --#if __UCLIBC_MAJOR__ == 0 && \ -- (__UCLIBC_MINOR__ < 9 || \ -- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34)) - #undef rpmatch - #define rpmatch __rpmatch - static inline int __rpmatch(const char *resp) -@@ -129,8 +123,6 @@ static inline int __rpmatch(const char * - return (resp[0] == 'y' || resp[0] == 'Y') ? 1 : - (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1; - } --#endif --#endif - - /** - * prompt the user for confirmation --- a/include/mtd/ubifs-media.h +++ b/include/mtd/ubifs-media.h @@ -33,7 +33,15 @@