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.c | |
| 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.c')
| -rw-r--r-- | Zend/zend_string.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 1833bbd241..4e1745e25d 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -21,13 +21,13 @@ #include "zend.h" #include "zend_globals.h" -ZEND_API zend_string *(*zend_new_interned_string)(zend_string *str TSRMLS_DC); -ZEND_API void (*zend_interned_strings_snapshot)(TSRMLS_D); -ZEND_API void (*zend_interned_strings_restore)(TSRMLS_D); +ZEND_API zend_string *(*zend_new_interned_string)(zend_string *str); +ZEND_API void (*zend_interned_strings_snapshot)(void); +ZEND_API void (*zend_interned_strings_restore)(void); -static zend_string *zend_new_interned_string_int(zend_string *str TSRMLS_DC); -static void zend_interned_strings_snapshot_int(TSRMLS_D); -static void zend_interned_strings_restore_int(TSRMLS_D); +static zend_string *zend_new_interned_string_int(zend_string *str); +static void zend_interned_strings_snapshot_int(void); +static void zend_interned_strings_restore_int(void); ZEND_API zend_ulong zend_hash_func(const char *str, size_t len) { @@ -43,7 +43,7 @@ static void _str_dtor(zval *zv) } #endif -void zend_interned_strings_init(TSRMLS_D) +void zend_interned_strings_init(void) { #ifndef ZTS zend_string *str; @@ -58,7 +58,7 @@ void zend_interned_strings_init(TSRMLS_D) /* interned empty string */ str = zend_string_alloc(sizeof("")-1, 1); str->val[0] = '\000'; - CG(empty_string) = zend_new_interned_string_int(str TSRMLS_CC); + CG(empty_string) = zend_new_interned_string_int(str); #endif /* one char strings (the actual interned strings are going to be created by ext/opcache) */ @@ -69,14 +69,14 @@ void zend_interned_strings_init(TSRMLS_D) zend_interned_strings_restore = zend_interned_strings_restore_int; } -void zend_interned_strings_dtor(TSRMLS_D) +void zend_interned_strings_dtor(void) { #ifndef ZTS zend_hash_destroy(&CG(interned_strings)); #endif } -static zend_string *zend_new_interned_string_int(zend_string *str TSRMLS_DC) +static zend_string *zend_new_interned_string_int(zend_string *str) { #ifndef ZTS zend_ulong h; @@ -143,7 +143,7 @@ static zend_string *zend_new_interned_string_int(zend_string *str TSRMLS_DC) #endif } -static void zend_interned_strings_snapshot_int(TSRMLS_D) +static void zend_interned_strings_snapshot_int(void) { #ifndef ZTS uint idx; @@ -159,7 +159,7 @@ static void zend_interned_strings_snapshot_int(TSRMLS_D) #endif } -static void zend_interned_strings_restore_int(TSRMLS_D) +static void zend_interned_strings_restore_int(void) { #ifndef ZTS uint nIndex; |