- attempt to fix WONKY build

diff --git a/http.c b/http.c
index bbbb03aa99b20d95bbf32791b357f417c896f6ac..00f8919b5096360e1964b41b8950fd8426aed772 100644 (file)
--- 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 ae4254a2621810a73074912f3c62d0abde9ff237..00a8007db26ed08a03041bb8c7a0585c554bce3c 100644 (file)
--- 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 e026052e3c3394cb5c87c5c0f2f133b85276c6ef..83f1dc6f09da9e550940069b7e65c62a74c1831c 100644 (file)
--- 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 e228bbc1b87f56baf8fb9397dd83d1f612d7230e..18662bce10d10511d5ab7dea5a2bb7a970b322b5 100644 (file)
--- 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);