diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_string.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
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 9a4eb8329c..bd871e29e2 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() @@ -284,7 +284,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; @@ -292,7 +292,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; @@ -300,7 +300,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); |