diff options
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 6df74c790c..b1e2a4410e 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -210,16 +210,15 @@ ZEND_API int zend_atoi(const char *str, int str_len); } - #define Z_LVAL(zval) (zval).value.lval #define Z_BVAL(zval) ((zend_bool)(zval).value.lval) #define Z_DVAL(zval) (zval).value.dval #define Z_STRVAL(zval) (zval).value.str.val #define Z_STRLEN(zval) (zval).value.str.len #define Z_ARRVAL(zval) (zval).value.ht -#define Z_OBJ(zval) &(zval).value.obj -#define Z_OBJPROP(zval) (zval).value.obj.properties -#define Z_OBJCE(zval) (zval).value.obj.ce +#define Z_OBJ(zval) (zval).value.obj.handlers.get_address((zval).value.obj.handle) +#define Z_OBJPROP(zval) Z_OBJ(zval)->properties +#define Z_OBJCE(zval) Z_OBJ(zval)->ce #define Z_RESVAL(zval) (zval).value.lval #define Z_LVAL_P(zval_p) Z_LVAL(*zval_p) |