From 6d703c5967527d8bcc85bf9bd3b137c03cb6cd3d Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Mon, 3 Oct 2005 19:24:09 +0000 Subject: [PATCH] - In a conditional statement "a ? b ? c", a and b MUST have the same type # We should make this an inline function to prevent unnecessary calls to # get classentry or requir that class_entry must return a valid class_entry # which we do iirc anyway. --- Zend/zend_execute.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 309b31d305..7095ac1b15 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -204,7 +204,7 @@ void zend_shutdown_timeout_thread(); /* The following tries to resolve the classname of a zval of type object. * Since it is slow it should be only used in error messages. */ -#define Z_OBJ_CLASS_NAME_P(zval) ((zval) && (zval)->type == IS_OBJECT && Z_OBJ_HT_P(zval)->get_class_entry != NULL && Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC) ? Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC)->name : EMPTY_STR) +#define Z_OBJ_CLASS_NAME_P(zval) ((zval) && (zval)->type == IS_OBJECT && Z_OBJ_HT_P(zval)->get_class_entry != NULL && Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC) ? Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC)->name : (char*)EMPTY_STR) ZEND_API zval** zend_get_compiled_variable_value(zend_execute_data *execute_data_ptr, zend_uint var); -- 2.50.1