[Bug 529806] Cannot build in 64-bit Mac OS X due to libiconv

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 517b7b4..3b2d396 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -61,7 +61,8 @@
 #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
 #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_CC__) && !defined (__LP_64__)
 #error GNU libiconv not in use but included iconv.h is from libiconv
 #endif