X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=a9da727fce1439065c735c2bde725c4ac2a34501;hp=703f2b168df4be90cae6a24df486d6285a02fd94;hb=2b9bcedabdd05c42571a4ccb18855e84cd4d89be;hpb=6da3520587f9f79c7429501289512d2a2415b517 diff --git a/missing.h b/missing.h index 703f2b1..a9da727 100644 --- a/missing.h +++ b/missing.h @@ -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) @@ -59,6 +71,19 @@ # 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; \