diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-09 23:54:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-09 23:54:03 +0200 |
| commit | a6be32f59a0f0ae7088f5afc1e354e185a481130 (patch) | |
| tree | f4f175ff97c241cdc3174c392b6c12c311f9a620 /Zend/zend_string.h | |
| parent | 19ccd7994235a127db0ed6f9582d324244d5fad1 (diff) | |
| download | php-git-a6be32f59a0f0ae7088f5afc1e354e185a481130.tar.gz | |
IS_INTERNED is not always 0 in ZTS
The current implementation chooses to intern "" in ZTS. Either that
should be removed or IS_INTERNED needs to actually check the flag.
Diffstat (limited to 'Zend/zend_string.h')
| -rw-r--r-- | Zend/zend_string.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 3072afd322..6ff35fb22c 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -35,11 +35,7 @@ void zend_interned_strings_dtor(TSRMLS_D); END_EXTERN_C() -#ifndef ZTS -# define IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED) -#else -# define IS_INTERNED(s) 0 -#endif +#define IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED) #define STR_HASH_VAL(s) zend_str_hash_val(s) #define STR_FORGET_HASH_VAL(s) zend_str_forget_hash_val(s) |