fix bug #64380 (http_message_object.c build fails in 5.5.0alpha6)

[m6w6/ext-http] / missing.h

diff --git a/missing.h b/missing.h
index 252aed9ae00f85910489276d4919731b07809130..0186ea50b3f8efb7c5a2207e62d945e1b52a4aee 100644 (file)
--- a/missing.h
+++ b/missing.h
@@ -22,6 +22,10 @@
 #endif
 
 #if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
+#      if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500)
+#              define ZEND_GET_PPTR_TYPE_DC , int type
+#              define ZEND_GET_PPTR_TYPE_CC , type
+#endif
 #      define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key
 #      define ZEND_LITERAL_KEY_CC , _zend_literal_key
 #      define ZEND_LITERAL_NIL_CC , NULL
@@ -42,6 +46,8 @@
        }
 
 #else
+#      define ZEND_GET_PPTR_TYPE_DC
+#      define ZEND_GET_PPTR_TYPE_CC
 #      define ZEND_LITERAL_KEY_DC
 #      define ZEND_LITERAL_KEY_CC
 #      define ZEND_LITERAL_NIL_CC
@@ -70,7 +76,7 @@
 #      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_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
@@ -78,7 +84,7 @@
 #      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_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
 #      define HTTP_STATIC_ARG_INFO static
 #endif