fix access og HttpMessage properties

[m6w6/ext-http] / missing.h

diff --git a/missing.h b/missing.h
index 1ad4b2a78be93b5b06733b975707a7bcfddf8477..5a1fc48c6c3617c6ed708b9b8ad770613ae275cd 100644 (file)
--- a/missing.h
+++ b/missing.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -18,9 +18,21 @@
 #include "php_version.h"
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
+#      define HTTP_ZAPI_HASH_TSRMLS_CC TSRMLS_CC
+#      define HTTP_ZAPI_HASH_TSRMLS_DC TSRMLS_DC
 #      define HTTP_ZAPI_CONST_CAST(t) (const t)
+#      define GLOBAL_ERROR_HANDLING EG(error_handling)
+#      define GLOBAL_EXCEPTION_CLASS EG(exception_class)
+#      define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
+#      define HTTP_STATIC_ARG_INFO
 #else
+#      define HTTP_ZAPI_HASH_TSRMLS_CC
+#      define HTTP_ZAPI_HASH_TSRMLS_DC
 #      define HTTP_ZAPI_CONST_CAST(t) (t)
+#      define GLOBAL_ERROR_HANDLING PG(error_handling)
+#      define GLOBAL_EXCEPTION_CLASS PG(exception_class)
+#      define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
+#      define HTTP_STATIC_ARG_INFO static
 #endif
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
@@ -55,6 +67,23 @@
 #      endif
 #endif
 
+#ifndef ZVAL_ADDREF
+#      define ZVAL_ADDREF Z_ADDREF_P
+#endif
+
+#ifndef SEPARATE_ARG_IF_REF
+#define SEPARATE_ARG_IF_REF(zv) \
+       if (PZVAL_IS_REF(zv)) { \
+               zval *ov = zv; \
+               ALLOC_INIT_ZVAL(zv); \
+               Z_TYPE_P(zv) = Z_TYPE_P(ov); \
+               zv->value = ov->value; \
+               zval_copy_ctor(zv); \
+       } else { \
+               ZVAL_ADDREF(zv); \
+       }
+#endif
+
 #ifndef ZVAL_ZVAL
 #define ZVAL_ZVAL(z, zv, copy, dtor) {  \
                int is_ref, refcount;           \