Merge branch 'master' into phpng
[m6w6/ext-http] / php_http_querystring.c
index 589b015..5f4eff8 100644 (file)
@@ -16,6 +16,9 @@
 #include <ext/spl/spl_array.h>
 
 #ifdef PHP_HTTP_HAVE_ICONV
+#      ifndef HAVE_ICONV
+#              define HAVE_ICONV 1
+#      endif
 #      undef PHP_ATOM_INC
 #      include <ext/iconv/php_iconv.h>
 #endif