X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_querystring.c;h=5f4eff81a9a101414d4ffed647fcc9ae6c9a4f12;hp=a77118c406d89ab5e177f21d95a54e056e28b786;hb=5e56841ce913380b8c2a8f2f602ad9bc1f20014e;hpb=f6600e3e5a683077874e6bbfda11900e6a7613f3

diff --git a/php_http_querystring.c b/php_http_querystring.c
index a77118c..5f4eff8 100644
--- a/php_http_querystring.c
+++ b/php_http_querystring.c
@@ -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
@@ -178,7 +181,7 @@ ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size
 	opts.val = vsepp;
 	opts.flags = PHP_HTTP_PARAMS_QUERY;
 
-	if (SUCCESS == php_http_ini_entry(ZEND_STRL("arg_separator.input"), &asi_str, &asi_len, 0 TSRMLS_CC) && asi_len) {
+	if (SUCCESS == php_http_ini_entry(ZEND_STRL("arg_separator.input"), &asi_str, &asi_len, 0) && asi_len) {
 		zval arr;
 
 		array_init_size(&arr, asi_len);
@@ -329,7 +332,7 @@ PHP_METHOD(HttpQueryString, __construct)
 	zval *params = NULL;
 	zend_error_handling zeh;
 	
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &params), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &params), invalid_arg, return);
 
 	zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh);
 	php_http_querystring_set(getThis(), params, 0);
@@ -594,7 +597,7 @@ PHP_METHOD(HttpQueryString, offsetSet)
 	zend_string *offset;
 	zval *value, param, znull;
 	
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz", &offset, &value)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &offset, &value)) {
 		return;
 	}
 
@@ -641,7 +644,7 @@ PHP_METHOD(HttpQueryString, offsetUnset)
 	zend_string *offset;
 	zval param, znull;
 	
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &offset)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) {
 		return;
 	}