diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
| commit | ab8094c666048b747481df0b9da94e08cadc4160 (patch) | |
| tree | 3ac94d92f4b07fe2d1d98db81203c85572bea82c /Zend/zend_builtin_functions.c | |
| parent | 7a41e4c0d0ddb2cfb91e31b210d7bceb158d2ab4 (diff) | |
| download | php-git-ab8094c666048b747481df0b9da94e08cadc4160.tar.gz | |
Pack zend_constant.flags and zend_constant.module_number into reserved space inside zend_constant.value.
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 9011c82fc3..4989b4b5b5 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -909,9 +909,9 @@ register_constant: "define(): Declaration of case-insensitive constants is deprecated"); } - c.flags = case_sensitive; /* non persistent */ + /* non persistent */ + ZEND_CONSTANT_SET_FLAGS(&c, case_sensitive, PHP_USER_CONSTANT); c.name = zend_string_copy(name); - c.module_number = PHP_USER_CONSTANT; if (zend_register_constant(&c) == SUCCESS) { RETURN_TRUE; } else { @@ -2145,13 +2145,13 @@ ZEND_FUNCTION(get_defined_constants) continue; } - if (val->module_number == PHP_USER_CONSTANT) { + if (ZEND_CONSTANT_MODULE_NUMBER(val) == PHP_USER_CONSTANT) { module_number = i; - } else if (val->module_number > i || val->module_number < 0) { + } else if (ZEND_CONSTANT_MODULE_NUMBER(val) > i) { /* should not happen */ continue; } else { - module_number = val->module_number; + module_number = ZEND_CONSTANT_MODULE_NUMBER(val); } if (Z_TYPE(modules[module_number]) == IS_UNDEF) { |