bugfix for glib on OS X: libiconv test applies to 32-bit versions also

This commit is contained in:
Tony Theodore 2010-10-03 05:07:05 +11:00
parent 04e4481b56
commit 7b4292f2f8
1 changed files with 1 additions and 1 deletions

View File

@ -12,7 +12,7 @@ diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c
#error GNU libiconv in use but included iconv.h not from libiconv
#endif
-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !(defined(__APPLE__) && defined(__LP64__))
+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__)
#error GNU libiconv not in use but included iconv.h is from libiconv
#endif