diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /ext/pcre/php_pcre.h | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'ext/pcre/php_pcre.h')
| -rw-r--r-- | ext/pcre/php_pcre.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index fb155c467e..7515726449 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/php_pcre.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -81,13 +81,8 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre) int error_code; ZEND_END_MODULE_GLOBALS(pcre) -PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre); - -#ifdef ZTS -# define PCRE_G(v) ZEND_TSRMG(pcre_globals_id, zend_pcre_globals *, v) -#else -# define PCRE_G(v) (pcre_globals.v) -#endif +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre) +#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v) #else |