From 60ec6f16e06d6666aaf4d4fec36fd53e2e504a0c Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 5 Aug 2008 07:46:20 +0000 Subject: [PATCH] fix 5.3 build once again --- http_request_object.c | 2 +- missing.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/http_request_object.c b/http_request_object.c index 10a26b0..09d7822 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -637,7 +637,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ if ( (Z_TYPE_P(options) != IS_ARRAY) || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry) - || (!zend_is_callable(*entry, 0, NULL)))) { + || (!IS_CALLABLE(*entry, 0, NULL)))) { MAKE_STD_ZVAL(pcb); array_init(pcb); ZVAL_ADDREF(getThis()); diff --git a/missing.h b/missing.h index edc3af0..0b46545 100644 --- a/missing.h +++ b/missing.h @@ -21,10 +21,12 @@ # 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) -- 2.30.2