Merge branch 'v2.6.x'

[m6w6/ext-http] / src / php_http_querystring.h

diff --git a/src/php_http_querystring.h b/src/php_http_querystring.h
index 3391e9132f7fea8cf32418fe3cf3506d7152c9dc..dc45f31c452484a2039c1f6951984401a0f2ecb5 100644 (file)
--- a/src/php_http_querystring.h
+++ b/src/php_http_querystring.h
@@ -14,21 +14,21 @@
 #define PHP_HTTP_QUERYSTRING_H
 
 #ifdef PHP_HTTP_HAVE_ICONV
-PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe);
 #endif /* PHP_HTTP_HAVE_ICONV */
-PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *qstring TSRMLS_DC);
-PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *qstring);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params);
 
 typedef php_http_object_t php_http_querystring_object_t;
 
-#define PHP_HTTP_QUERYSTRING_TYPE_BOOL         IS_BOOL
+#define PHP_HTTP_QUERYSTRING_TYPE_BOOL         _IS_BOOL
 #define PHP_HTTP_QUERYSTRING_TYPE_INT          IS_LONG
 #define PHP_HTTP_QUERYSTRING_TYPE_FLOAT                IS_DOUBLE
 #define PHP_HTTP_QUERYSTRING_TYPE_STRING       IS_STRING
 #define PHP_HTTP_QUERYSTRING_TYPE_ARRAY                IS_ARRAY
 #define PHP_HTTP_QUERYSTRING_TYPE_OBJECT       IS_OBJECT
 
-PHP_HTTP_API zend_class_entry *php_http_querystring_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_querystring_get_class_entry(void);
 
 PHP_MINIT_FUNCTION(http_querystring);