com php-src: use Z_* family macros: Zend/zend_const ants.c

Commit: 2966e63faf36c62251852d2278aa209ff12e42c6 Author: krakjoe <joe.watkins@live.co.uk> Mon, 15 Apr 2013 18:27:45 +0100 Parents: f11d620cb62cc17baab58c92d0a81dcde90887f6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2966e63faf36c62251852d2278aa209ff12e42c6 Log: use Z_* family macros Changed paths: M Zend/zend_constants.c Diff: diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index c00caa8..216206c 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -126,33 +126,33 @@ void zend_register_standard_constants(TSRMLS_D) c.name = zend_strndup(ZEND_STRL("TRUE")); c.name_len = sizeof("TRUE"); - c.value.value.lval = 1; - c.value.type = IS_BOOL; + Z_LVAL(c.value) = 1; + Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); c.name = zend_strndup(ZEND_STRL("FALSE")); c.name_len = sizeof("FALSE"); - c.value.value.lval = 0; - c.value.type = IS_BOOL; + Z_LVAL(c.value) = 0; + Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); c.name = zend_strndup(ZEND_STRL("NULL")); c.name_len = sizeof("NULL"); - c.value.type = IS_NULL; + Z_TYPE(c.value) = IS_NULL; zend_register_constant(&c TSRMLS_CC); c.flags = CONST_PERSISTENT | CONST_CS; c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE")); c.name_len = sizeof("ZEND_THREAD_SAFE"); - c.value.value.lval = ZTS_V; - c.value.type = IS_BOOL; + Z_LVAL(c.value) = ZTS_V; + Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); c.name = zend_strndup(ZEND_STRL("ZEND_DEBUG_BUILD")); c.name_len = sizeof("ZEND_DEBUG_BUILD"); - c.value.value.lval = ZEND_DEBUG; - c.value.type = IS_BOOL; + Z_LVAL(c.value) = ZEND_DEBUG; + Z_TYPE(c.value) = IS_BOOL; zend_register_constant(&c TSRMLS_CC); } } @@ -179,8 +179,8 @@ ZEND_API void zend_register_bool_constant(const char *name, uint name_len, zend_ { zend_constant c; - c.value.type = IS_BOOL; - c.value.value.lval = bval; + Z_TYPE(c.value) = IS_BOOL; + Z_LVAL(c.value) = bval; c.flags = flags; c.name = zend_strndup(name, name_len-1); c.name_len = name_len; @@ -192,8 +192,8 @@ ZEND_API void zend_register_long_constant(const char *name, uint name_len, long { zend_constant c; - c.value.type = IS_LONG; - c.value.value.lval = lval; + Z_TYPE(c.value) = IS_LONG; + Z_LVAL(c.value) = lval; c.flags = flags; c.name = zend_strndup(name, name_len-1); c.name_len = name_len; @@ -206,8 +206,8 @@ ZEND_API void zend_register_double_constant(const char *name, uint name_len, dou { zend_constant c; - c.value.type = IS_DOUBLE; - c.value.value.dval = dval; + Z_TYPE(c.value) = IS_DOUBLE; + Z_DVAL(c.value) = dval; c.flags = flags; c.name = zend_strndup(name, name_len-1); c.name_len = name_len; @@ -220,9 +220,9 @@ ZEND_API void zend_register_stringl_constant(const char *name, uint name_len, ch { zend_constant c; - c.value.type = IS_STRING; - c.value.value.str.val = strval; - c.value.value.str.len = strlen; + Z_TYPE(c.value) = IS_STRING; + Z_STRVAL(c.value) = strval; + Z_STRLEN(c.value) = strlen; c.flags = flags; c.name = zend_strndup(name, name_len-1); c.name_len = name_len;