From 47475dbe6ab981679cbc2931306973d2143694cd Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 24 Feb 2012 17:04:52 -0800 Subject: [PATCH] [Bug 529806] Cannot build in 64-bit Mac OS X due to libiconv --- glib/gconvert.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glib/gconvert.c b/glib/gconvert.c index 517b7b4..3b2d396 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 -- 2.7.4