diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
| commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
| tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /Zend/zend_string.h | |
| parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
| download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz | |
first shot remove TSRMLS_* things
Diffstat (limited to 'Zend/zend_string.h')
| -rw-r--r-- | Zend/zend_string.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 1da3b511c0..247991bcdd 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -25,13 +25,13 @@ BEGIN_EXTERN_C() -ZEND_API extern zend_string *(*zend_new_interned_string)(zend_string *str TSRMLS_DC); -ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D); -ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D); +ZEND_API extern zend_string *(*zend_new_interned_string)(zend_string *str); +ZEND_API extern void (*zend_interned_strings_snapshot)(void); +ZEND_API extern void (*zend_interned_strings_restore)(void); ZEND_API zend_ulong zend_hash_func(const char *str, size_t len); -void zend_interned_strings_init(TSRMLS_D); -void zend_interned_strings_dtor(TSRMLS_D); +void zend_interned_strings_init(void); +void zend_interned_strings_dtor(void); END_EXTERN_C() @@ -282,7 +282,7 @@ EMPTY_SWITCH_DEFAULT_CASE() return hash; } -static zend_always_inline void zend_interned_empty_string_init(zend_string **s TSRMLS_DC) +static zend_always_inline void zend_interned_empty_string_init(zend_string **s) { zend_string *str; @@ -290,7 +290,7 @@ static zend_always_inline void zend_interned_empty_string_init(zend_string **s T str->val[0] = '\000'; #ifndef ZTS - *s = zend_new_interned_string(str TSRMLS_CC); + *s = zend_new_interned_string(str); #else zend_string_hash_val(str); str->gc.u.v.flags |= IS_STR_INTERNED; @@ -298,7 +298,7 @@ static zend_always_inline void zend_interned_empty_string_init(zend_string **s T #endif } -static zend_always_inline void zend_interned_empty_string_free(zend_string **s TSRMLS_DC) +static zend_always_inline void zend_interned_empty_string_free(zend_string **s) { if (NULL != *s) { free(*s); |