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 /ext/spl/php_spl.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 'ext/spl/php_spl.h')
| -rw-r--r-- | ext/spl/php_spl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 534a03885e..6d075e6c3f 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -67,7 +67,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl) ZEND_END_MODULE_GLOBALS(spl) #ifdef ZTS -# define SPL_G(v) TSRMG(spl_globals_id, zend_spl_globals *, v) +# define SPL_G(v) ZEND_TSRMG(spl_globals_id, zend_spl_globals *, v) extern int spl_globals_id; #else # define SPL_G(v) (spl_globals.v) @@ -79,7 +79,7 @@ PHP_FUNCTION(class_parents); PHP_FUNCTION(class_implements); PHP_FUNCTION(class_uses); -PHPAPI zend_string *php_spl_object_hash(zval *obj TSRMLS_DC); +PHPAPI zend_string *php_spl_object_hash(zval *obj); #endif /* PHP_SPL_H */ |