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

[John Ralls <jralls src gnome org>]

commit 8ec2b1a899d8ccf2494fded0e9a64ce7d9627c54
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 24 17:04:52 2012 -0800

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

 glib/gconvert.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/glib/gconvert.c b/glib/gconvert.c
index d601cad..aa9235d 100644
--- 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