summaryrefslogtreecommitdiff
path: root/glib/glib-2.28.1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'glib/glib-2.28.1.patch')
-rw-r--r--glib/glib-2.28.1.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch
index cadcc4db2cb8..da993817da7f 100644
--- a/glib/glib-2.28.1.patch
+++ b/glib/glib-2.28.1.patch
@@ -39,3 +39,20 @@
#include "gthreadprivate.h"
/**
+--- misc/glib-2.28.1/glib/gconvert.c
++++ misc/build/glib-2.28.1/glib/gconvert.c
+@@ -58,13 +58,6 @@
+
+ #include "glibintl.h"
+
+-#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)
+-#error GNU libiconv not in use but included iconv.h is from libiconv
+-#endif
+-
+
+ /**
+ * SECTION:conversions
+