X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=d767f40c7cf2733a42576a131c6b2e0a6035530d;hp=2da5c37ba025a68fbae97ce315dcd1330430c0f4;hb=f12e0c5ab62139e372a4ca509637dc458e7c9cb4;hpb=accf1817e811a7edabd687ef6105983f39f13942 diff --git a/missing.h b/missing.h index 2da5c37..d767f40 100644 --- 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-2006, Michael Wallner | + | Copyright (c) 2004-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -17,6 +17,24 @@ #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) # define WONKY #endif @@ -49,6 +67,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 +91,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