From fb8b98d958d628027081c1a140c488665588d37c Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 29 Nov 2006 08:55:37 +0000 Subject: [PATCH] - fix win32 warnings - fix WONKY build --- config.w32 | 1 + http_requestdatashare_object.c | 2 +- php_http_api.h | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config.w32 b/config.w32 index 9f50e99..2519240 100644 --- a/config.w32 +++ b/config.w32 @@ -110,6 +110,7 @@ if (PHP_HTTP != "no") { AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, ""); AC_DEFINE("HAVE_CURL_EASY_RESET", 1, ""); AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, ""); + AC_DEFINE("HAVE_CURL_FORMGET", 1, ""); AC_DEFINE("HAVE_CURL_MULTI_SETOPT", 1, ""); AC_DEFINE("HAVE_CURL_MULTI_TIMEOUT", 1, ""); } else { diff --git a/http_requestdatashare_object.c b/http_requestdatashare_object.c index 103581e..eaa2186 100644 --- a/http_requestdatashare_object.c +++ b/http_requestdatashare_object.c @@ -282,6 +282,7 @@ PHP_METHOD(HttpRequestDataShare, singleton) SET_EH_NORMAL(); } /* }}} */ +#endif /* !WONKY */ static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool global TSRMLS_DC) { @@ -306,7 +307,6 @@ static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool } return this_ptr; } -#endif /* !WONKY */ #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ diff --git a/php_http_api.h b/php_http_api.h index 190db23..98038b3 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -306,13 +306,13 @@ static inline void _zval_free(zval **z) } typedef struct _HashKey { - int type; - int dup; char *str; uint len; ulong num; + uint dup:1; + uint type:31; } HashKey; -#define initHashKey(dup) {0, (dup), NULL, 0, 0} +#define initHashKey(dup) {NULL, 0, 0, (dup), 0} #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val) #define FOREACH_HASH_VAL(pos, hash, val) \ @@ -323,13 +323,13 @@ typedef struct _HashKey { #define FOREACH_KEY(pos, array, key) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), key) #define FOREACH_HASH_KEY(pos, hash, _key) \ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ + ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ zend_hash_move_forward_ex(hash, &pos)) \ #define FOREACH_KEYVAL(pos, array, key, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), key, val) #define FOREACH_HASH_KEYVAL(pos, hash, _key, val) \ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ + ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ zend_hash_move_forward_ex(hash, &pos)) -- 2.30.2