MSWSP: * add parse_lcid()
[wireshark-wip.git] / macosx-support-lib-patches / glib-gconvert.c.patch
blob43ac6d5e2f95f8b07b099eb34b897dce63ef96ac
1 --- glib/gconvert.c.dist 2008-09-12 10:55:51.000000000 -0700
2 +++ glib/gconvert.c 2013-07-08 17:23:57.000000000 -0700
3 @@ -52,7 +52,9 @@
4 #error GNU libiconv in use but included iconv.h not from libiconv
5 #endif
6 #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
7 -#error GNU libiconv not in use but included iconv.h is from libiconv
8 + #if !defined (__APPLE_CC__) && !defined (__LP_64__)
9 + #error GNU libiconv not in use but included iconv.h is from libiconv
10 + #endif
11 #endif
13 #include "galias.h"