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 /win32/php_win32_globals.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 'win32/php_win32_globals.h')
| -rw-r--r-- | win32/php_win32_globals.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9411..4341a99959 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -26,7 +26,7 @@ typedef struct _php_win32_core_globals php_win32_core_globals; #ifdef ZTS -# define PW32G(v) TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v) +# define PW32G(v) ZEND_TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v) extern PHPAPI int php_win32_core_globals_id; #else # define PW32G(v) (the_php_win32_core_globals.v) @@ -43,8 +43,8 @@ struct _php_win32_core_globals { HashTable *registry_directories; }; -void php_win32_core_globals_ctor(void *vg TSRMLS_DC); -void php_win32_core_globals_dtor(void *vg TSRMLS_DC); +void php_win32_core_globals_ctor(void *vg); +void php_win32_core_globals_dtor(void *vg); PHP_RSHUTDOWN_FUNCTION(win32_core_globals); #endif |