X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_querystring_object.c;h=580ae6bf38d9639aa277a226c2fd9339248a7535;hp=73ef9d5960d94470dee7e62ba8375cc27611ced3;hb=46fc12676a53668d55fe6d02d44210e2eaf4b6b5;hpb=eec11ec92f122dbd2d02aba54a3685023cdbfcc7 diff --git a/http_querystring_object.c b/http_querystring_object.c index 73ef9d5..580ae6b 100644 --- a/http_querystring_object.c +++ b/http_querystring_object.c @@ -61,7 +61,7 @@ HTTP_BEGIN_ARGS(__getter, 1) HTTP_ARG_VAL(delete, 0) HTTP_END_ARGS; -#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV) +#if HTTP_HAVE_EXT(ICONV) HTTP_BEGIN_ARGS(xlate, 2) HTTP_ARG_VAL(from_encoding, 0) HTTP_ARG_VAL(to_encoding, 0) @@ -95,7 +95,7 @@ zend_function_entry http_querystring_object_fe[] = { #ifndef WONKY HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) #endif -#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV) +#if HTTP_HAVE_EXT(ICONV) HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC) #endif @@ -431,7 +431,7 @@ HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY); HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT); /* }}} */ -#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV) +#if HTTP_HAVE_EXT(ICONV) /* {{{ proto bool HttpQueryString::xlate(string ie, string oe) * * Converts the query string from the source encoding ie to the target encoding oe.