aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-support-lib-patches/glib-gconvert.patch
diff options
context:
space:
mode:
Diffstat (limited to 'macosx-support-lib-patches/glib-gconvert.patch')
-rw-r--r--macosx-support-lib-patches/glib-gconvert.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/macosx-support-lib-patches/glib-gconvert.patch b/macosx-support-lib-patches/glib-gconvert.patch
new file mode 100644
index 0000000000..fb0aea73b3
--- /dev/null
+++ b/macosx-support-lib-patches/glib-gconvert.patch
@@ -0,0 +1,10 @@
+--- glib-2.29.8/glib/gconvert.c.orig 2011-06-26 14:48:37.000000000 +0200
++++ glib-2.29.8/glib/gconvert.c 2011-06-26 14:49:58.000000000 +0200
+@@ -61,7 +61,7 @@
+ #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(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif