X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=0186ea50b3f8efb7c5a2207e62d945e1b52a4aee;hp=b3a249f1c47ae2185a59948d47ee5c4628fdb68c;hb=d49be1d46a5015f4b7daf1cb56754ba791cf9ec5;hpb=a197d80241b36d6f5581feeb80bea60a59fdbd02

diff --git a/missing.h b/missing.h
index b3a249f..0186ea5 100644
--- a/missing.h
+++ b/missing.h
@@ -17,7 +17,15 @@
 
 #include "php_version.h"
 
+#if ZEND_MODULE_API_NO >= 20100409
+#define ZEND_ENGINE_2_4
+#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
@@ -38,8 +46,11 @@
 	}
 
 #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
 #	define HTTP_CHECK_OPEN_BASEDIR(file, act) \
 	if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \
 	{ \
@@ -65,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
@@ -73,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