Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_misc.h

diff --git a/php_http_misc.h b/php_http_misc.h
index 421c9912cf57082283554c2c4ca759c82a098c4e..36f4020359877a501068eaa5dc359d67ed538b0c 100644 (file)
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -139,6 +139,11 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 
 /* ZEND */
 
+#ifdef PHP_DEBUG
+#      undef  HASH_OF
+#      define HASH_OF(p) ((HashTable*)(Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p)) : NULL))))
+#endif
+
 static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv)
 {
        if (!zo) {