--- 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