- fix win32 warnings

- fix WONKY build

diff --git a/config.w32 b/config.w32
index 9f50e991f0741bf3bbaede19cbfce5ec5ff01c84..2519240e104e8d29a4864fb0113cf05ec983e282 100644 (file)
--- 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_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 {
                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 103581e4dea71d2245bc361e2bec7dd6c2f87271..eaa2186035d824660402f8d20f66d29c13f67696 100644 (file)
--- a/http_requestdatashare_object.c
+++ b/http_requestdatashare_object.c
@@ -282,6 +282,7 @@ PHP_METHOD(HttpRequestDataShare, singleton)
        SET_EH_NORMAL();
 }
 /* }}} */
        SET_EH_NORMAL();
 }
 /* }}} */

+#endif /* !WONKY */

 
 static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool global TSRMLS_DC)
 {
 
 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;
 }
        }
        return this_ptr;
 }

-#endif /* !WONKY */

 
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 

diff --git a/php_http_api.h b/php_http_api.h
index 190db2355b8421efb40333b7f4809d15b40689ee..98038b3e4ec87d83549c44915bd362ca4ce478eb 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -306,13 +306,13 @@ static inline void _zval_free(zval **z)
 }
 
 typedef struct _HashKey {
 }
 
 typedef struct _HashKey {

-       int type;
-       int dup;

        char *str;
        uint len;
        ulong num;
        char *str;
        uint len;
        ulong num;

+       uint dup:1;
+       uint type:31;

 } HashKey;
 } 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) \
 
 #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); \
 #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); \
                        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))
 
                        zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
                        zend_hash_move_forward_ex(hash, &pos))