X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_querystring_api.c;fp=http_querystring_api.c;h=b367c20420e0e59ebf0561a0932d96520e07c5ce;hb=ebf03950ffaea849b931adf83b6c20ac9fb7ef33;hp=45aa5acc7666a26cbe5575cbbd1312ce5fac9ebe;hpb=9676c81efbb8f180fa189d71a7ecb50dde4f5646;p=m6w6%2Fext-http

diff --git a/http_querystring_api.c b/http_querystring_api.c
index 45aa5ac..b367c20 100644
--- a/http_querystring_api.c
+++ b/http_querystring_api.c
@@ -16,7 +16,7 @@
 #include "php_http.h"
 
 #include "php_variables.h"
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV)
 #	undef PHP_ATOM_INC
 #	include "ext/iconv/php_iconv.h"
 #	include "ext/standard/url.h"
@@ -38,7 +38,7 @@ static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type,
 static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
 
 
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV)
 PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC)
 {
 	HashPosition pos;