X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_querystring.c;h=566d43425d2e5146063a352329bd7d6d32af331e;hp=01d95f9f0ec91bd210fd2b15335a4fecc3cffac0;hb=597b66905b295d3a7ed408a92751a5f29e19fe01;hpb=700883ba05724a9dd14fa6d5a2eded658cf0496c

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index 01d95f9..566d434 100644
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -15,7 +15,7 @@
 #include "php_variables.h"
 #include "ext/spl/spl_array.h"
 
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
 #	ifndef HAVE_ICONV
 #		define HAVE_ICONV 1
 #	endif
@@ -92,7 +92,7 @@ static inline void php_http_querystring_get(zval *instance, int type, char *name
 	}
 }
 
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
 ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe)
 {
 	zval *entry;
@@ -385,10 +385,8 @@ PHP_METHOD(HttpQueryString, getGlobalInstance)
 
 		ZVAL_MAKE_REF(_GET);
 		zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
-
-		zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
 	} else {
-		php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array", NULL);
+		php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array");
 	}
 
 }
@@ -534,7 +532,7 @@ PHP_HTTP_QUERYSTRING_GETTER(getString, IS_STRING);
 PHP_HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
 PHP_HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
 
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_xlate, 0, 0, 2)
 	ZEND_ARG_INFO(0, from_encoding)
 	ZEND_ARG_INFO(0, to_encoding)
@@ -682,7 +680,7 @@ PHP_METHOD(HttpQueryString, offsetUnset)
 }
 
 static zend_function_entry php_http_querystring_methods[] = {
-	PHP_ME(HttpQueryString, __construct, ai_HttpQueryString___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
+	PHP_ME(HttpQueryString, __construct, ai_HttpQueryString___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 
 	PHP_ME(HttpQueryString, toArray, ai_HttpQueryString_toArray, ZEND_ACC_PUBLIC)
 	PHP_ME(HttpQueryString, toString, ai_HttpQueryString_toString, ZEND_ACC_PUBLIC)
@@ -702,7 +700,7 @@ static zend_function_entry php_http_querystring_methods[] = {
 	PHP_ME(HttpQueryString, getIterator, ai_HttpQueryString_getIterator, ZEND_ACC_PUBLIC)
 
 	PHP_ME(HttpQueryString, getGlobalInstance, ai_HttpQueryString_getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
 	PHP_ME(HttpQueryString, xlate, ai_HttpQueryString_xlate, ZEND_ACC_PUBLIC)
 #endif