- Fixed build on php-trunk

[m6w6/ext-http] / php_http_querystring_api.h

diff --git a/php_http_querystring_api.h b/php_http_querystring_api.h
index 05bcbcbe14ceba32f9abd4d943051b2c08541dec..2a366b3bd0d40bc20526780f2b1cf132b092d26a 100644 (file)
--- a/php_http_querystring_api.h
+++ b/php_http_querystring_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,7 +15,7 @@
 #ifndef PHP_HTTP_QUERYSTRING_API_H
 #define PHP_HTTP_QUERYSTRING_API_H
 
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
 #define http_querystring_xlate(a, p, ie, oe) _http_querystring_xlate((a), (p), (ie), (oe) TSRMLS_CC)
 PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC);
 #endif
@@ -23,12 +23,6 @@ PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *i
 #define http_querystring_update(qa, qs) _http_querystring_update((qa), (qs) TSRMLS_CC)
 PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC);
 
-#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC)
-PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC);
-
-#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC)
-PHP_HTTP_API int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
-
 #define http_querystring_modify(q, p) _http_querystring_modify((q), (p) TSRMLS_CC)
 PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC);