X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=0b46545f866194a1673486935505dc43801a2e35;hp=547d11c5c1b7bc940494dd818bbf898a5edfb743;hb=a88a9ab5ca6e1aa2d2510c7ff3dda58d528602e5;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3 diff --git a/missing.h b/missing.h index 547d11c..0b46545 100644 --- a/missing.h +++ b/missing.h @@ -17,6 +17,18 @@ #include "php_version.h" +#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +# 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) +#else +# 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)) +#endif + #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0) # define WONKY #endif @@ -49,6 +61,10 @@ # endif #endif +#ifndef ZVAL_ADDREF +# define ZVAL_ADDREF Z_ADDREF_P +#endif + #ifndef ZVAL_ZVAL #define ZVAL_ZVAL(z, zv, copy, dtor) { \ int is_ref, refcount; \ @@ -69,10 +85,14 @@ } #endif #ifndef RETVAL_ZVAL -#define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor) +# define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor) #endif #ifndef RETURN_ZVAL -#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; } +# define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; } +#endif + +#ifndef ZEND_MN +# define ZEND_MN(name) ZEND_FN(name) #endif #ifdef WONKY