summaryrefslogtreecommitdiff
path: root/package/glib/patches/patch-glib_gconvert_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
commit902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch)
tree56c6b37cd9afd91d176cd75acb77bf32ccd20378 /package/glib/patches/patch-glib_gconvert_c
parent3d45df344602687c8983f5fb609721aa8ca2469f (diff)
parent52dbdcd1045c7a8ad96753593540719cff9f8863 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glib/patches/patch-glib_gconvert_c')
-rw-r--r--package/glib/patches/patch-glib_gconvert_c16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c
new file mode 100644
index 000000000..bd9db0404
--- /dev/null
+++ b/package/glib/patches/patch-glib_gconvert_c
@@ -0,0 +1,16 @@
+--- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200
++++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100
+@@ -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