summaryrefslogtreecommitdiff
path: root/main/php_globals.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
committerAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
commit4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch)
treec9628d91eae3f580f9ebd73d2372e4c9089b2e00 /main/php_globals.h
parent79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff)
parentdec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff)
downloadphp-git-POST_NATIVE_TLS_MERGE.tar.gz
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'main/php_globals.h')
-rw-r--r--main/php_globals.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_globals.h b/main/php_globals.h
index a60efe69de..76933d8f07 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -26,7 +26,7 @@
typedef struct _php_core_globals php_core_globals;
#ifdef ZTS
-# define PG(v) TSRMG(core_globals_id, php_core_globals *, v)
+# define PG(v) ZEND_TSRMG(core_globals_id, php_core_globals *, v)
extern PHPAPI int core_globals_id;
#else
# define PG(v) (core_globals.v)