X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_querystring_object.h;h=4a60d12757b3dc58f9b0fcd64a42b461052a5914;hp=b65229f43e53cb6beeaa7507f71071ec2c0e279c;hb=ebf03950ffaea849b931adf83b6c20ac9fb7ef33;hpb=110b098812fab295f921a45f057c97b490f97e87

diff --git a/php_http_querystring_object.h b/php_http_querystring_object.h
index b65229f..4a60d12 100644
--- a/php_http_querystring_object.h
+++ b/php_http_querystring_object.h
@@ -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;
 
@@ -44,17 +44,17 @@ PHP_METHOD(HttpQueryString, toString);
 PHP_METHOD(HttpQueryString, toArray);
 PHP_METHOD(HttpQueryString, get);
 PHP_METHOD(HttpQueryString, set);
-#ifndef WONKY
-PHP_METHOD(HttpQueryString, getInstance);
-#endif
 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 HAVE_ICONV
-PHP_METHOD(HttpQueryString, iconv);
+#ifdef HAVE_ICONV && !HTTP_SHARED_EXT(ICONV)
+PHP_METHOD(HttpQueryString, xlate);
+#endif
+#ifndef WONKY
+PHP_METHOD(HttpQueryString, singleton);
 #endif
 PHP_METHOD(HttpQueryString, serialize);
 PHP_METHOD(HttpQueryString, unserialize);