summaryrefslogtreecommitdiff
path: root/ext/phar/phar_internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/phar/phar_internal.h')
-rw-r--r--ext/phar/phar_internal.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index f5209faf75..48dfb9f7fa 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -195,15 +195,10 @@ ZEND_BEGIN_MODULE_GLOBALS(phar)
ZEND_END_MODULE_GLOBALS(phar)
ZEND_EXTERN_MODULE_GLOBALS(phar)
+#define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
-#ifdef ZTS
-# include "TSRM.h"
-# ifdef COMPILE_DL_PHAR
+#if defined(ZTS) && defined(COMPILE_DL_PHAR)
ZEND_TSRMLS_CACHE_EXTERN();
-# endif
-# define PHAR_G(v) ZEND_TSRMG(phar_globals_id, zend_phar_globals *, v)
-#else
-# define PHAR_G(v) (phar_globals.v)
#endif
#ifndef php_uint16