- Fixed build on php-trunk

[m6w6/ext-http] / php_http_querystring_object.h

diff --git a/php_http_querystring_object.h b/php_http_querystring_object.h
index e228bbc1b87f56baf8fb9397dd83d1f612d7230e..1b6f2be8767c98421a08372d3d5b3c9f0123df3f 100644 (file)
--- a/php_http_querystring_object.h
+++ b/php_http_querystring_object.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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -16,7 +16,7 @@
 #define PHP_HTTP_QUERYSTRING_OBJECT_H
 #ifdef ZEND_ENGINE_2
 
-typedef struct {
+typedef struct _http_querystring_object_t {
        zend_object zo;
 } http_querystring_object;
 
@@ -34,8 +34,8 @@ extern PHP_MINIT_FUNCTION(http_querystring_object);
 
 #define http_querystring_object_new(ce) _http_querystring_object_new((ce) TSRMLS_CC)
 extern zend_object_value _http_querystring_object_new(zend_class_entry *ce TSRMLS_DC);
-#define http_querystring_object_new_ex(ce, ptr) _http_querystring_object_new_ex((ce), (ptr) TSRMLS_CC)
-extern zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, http_querystring_object **ptr TSRMLS_DC);
+#define http_querystring_object_new_ex(ce, n, ptr) _http_querystring_object_new_ex((ce), (n), (ptr) TSRMLS_CC)
+extern zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *nothing, http_querystring_object **ptr TSRMLS_DC);
 #define http_querystring_object_free(o) _http_querystring_object_free((o) TSRMLS_CC)
 extern void _http_querystring_object_free(zend_object *object TSRMLS_DC);
 
@@ -44,14 +44,26 @@ PHP_METHOD(HttpQueryString, toString);
 PHP_METHOD(HttpQueryString, toArray);
 PHP_METHOD(HttpQueryString, get);
 PHP_METHOD(HttpQueryString, set);
-PHP_METHOD(HttpQueryString, getInstance);
+PHP_METHOD(HttpQueryString, mod);
 PHP_METHOD(HttpQueryString, getBool);
 PHP_METHOD(HttpQueryString, getInt);
 PHP_METHOD(HttpQueryString, getFloat);
 PHP_METHOD(HttpQueryString, getString);
 PHP_METHOD(HttpQueryString, getArray);
 PHP_METHOD(HttpQueryString, getObject);
-
+#ifdef HTTP_HAVE_ICONV
+PHP_METHOD(HttpQueryString, xlate);
+#endif
+PHP_METHOD(HttpQueryString, factory);
+#ifndef WONKY
+PHP_METHOD(HttpQueryString, singleton);
+#endif
+PHP_METHOD(HttpQueryString, serialize);
+PHP_METHOD(HttpQueryString, unserialize);
+PHP_METHOD(HttpQueryString, offsetGet);
+PHP_METHOD(HttpQueryString, offsetSet);
+PHP_METHOD(HttpQueryString, offsetExists);
+PHP_METHOD(HttpQueryString, offsetUnset);
 #endif
 #endif