From: Michael Wallner <mike@php.net>
Date: Sun, 5 Feb 2006 18:00:15 +0000 (+0000)
Subject: - attempt to fix WONKY build
X-Git-Tag: RELEASE_0_23_0~34
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;ds=sidebyside;h=fc59dd8cc364f6afe7a9707fe9a0784959551d68;hp=05a429c38be8a1b361586206489fe7adc2865dcc;p=m6w6%2Fext-http

- attempt to fix WONKY build
---

diff --git a/http.c b/http.c
index bbbb03a..00f8919 100644
--- a/http.c
+++ b/http.c
@@ -34,6 +34,7 @@
 #ifdef HTTP_HAVE_ZLIB
 #	include "php_http_encoding_api.h"
 #endif
+#include "php_http_url_api.h"
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_filter_api.h"
diff --git a/http_message_object.c b/http_message_object.c
index ae4254a..00a8007 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -18,6 +18,7 @@
 
 #ifdef ZEND_ENGINE_2
 
+#include "zend_interfaces.h"
 #include "ext/standard/url.h"
 
 #include "php_http_api.h"
@@ -32,7 +33,6 @@
 #include "php_http_request_object.h"
 
 #ifndef WONKY
-#	include "zend_interfaces.h"
 #	ifdef HAVE_SPL
 /* SPL doesn't install its headers */
 extern PHPAPI zend_class_entry *spl_ce_Countable;
diff --git a/http_querystring_object.c b/http_querystring_object.c
index e026052..83f1dc6 100644
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -35,9 +35,11 @@ HTTP_BEGIN_ARGS(__construct, 0, 0)
 	HTTP_ARG_VAL(params, 0)
 HTTP_END_ARGS;
 
+#ifndef WONKY
 HTTP_BEGIN_ARGS(getInstance, 0, 0)
 	HTTP_ARG_VAL(global, 0)
 HTTP_END_ARGS;
+#endif
 
 HTTP_EMPTY_ARGS(toArray, 0);
 HTTP_EMPTY_ARGS(toString, 0);
@@ -76,7 +78,9 @@ zend_function_entry http_querystring_object_fe[] = {
 	HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
 	HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
 	
+#ifndef WONKY
 	HTTP_QUERYSTRING_ME(getInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
 	
 	HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
 	HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
@@ -243,6 +247,7 @@ static inline int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
 	}
 }
 
+#ifndef WONKY
 #define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
 static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
 {
@@ -260,6 +265,7 @@ static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
 	
 	return zobj;
 }
+#endif
 
 #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC)
 static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC)
@@ -422,6 +428,7 @@ PHP_METHOD(HttpQueryString, set)
 }
 /* }}} */
 
+#ifndef WONKY
 /* {{{ proto HttpQueryString HttpQueryString::getInstance([bool global = true])
  *
  * Get a single instance (differentiates between the global setting).
@@ -458,6 +465,7 @@ PHP_METHOD(HttpQueryString, getInstance)
 	SET_EH_NORMAL();
 }
 /* }}} */
+#endif
 
 /* {{{ Getters by type */
 #define HTTP_QUERYSTRING_GETTER(method, TYPE) \
diff --git a/php_http_querystring_object.h b/php_http_querystring_object.h
index e228bbc..18662bc 100644
--- a/php_http_querystring_object.h
+++ b/php_http_querystring_object.h
@@ -44,7 +44,9 @@ 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);