fix 5.3 build once again
authorMichael Wallner <mike@php.net>
Tue, 5 Aug 2008 07:46:20 +0000 (07:46 +0000)
committerMichael Wallner <mike@php.net>
Tue, 5 Aug 2008 07:46:20 +0000 (07:46 +0000)
http_request_object.c
missing.h

index 10a26b0ab9f23263bfbde75cc29c2a1ca89262a9..09d7822d90b0124855b1f02e2a221452eff532b3 100644 (file)
@@ -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());
index edc3af0f7f108f506028857edf55b0ec330d63af..0b46545f866194a1673486935505dc43801a2e35 100644 (file)
--- a/missing.h
+++ b/missing.h
 #      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)