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/mcrypt/php_mcrypt.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/mcrypt/php_mcrypt.h')
| -rw-r--r-- | ext/mcrypt/php_mcrypt.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h index 1fc9e41fe8..438564219e 100644 --- a/ext/mcrypt/php_mcrypt.h +++ b/ext/mcrypt/php_mcrypt.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 | @@ -83,11 +83,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mcrypt) int fd[2]; // RANDOM = 0, URANDOM = 1 ZEND_END_MODULE_GLOBALS(mcrypt) -#ifdef ZTS -# define MCG(v) TSRMG(mcrypt_globals_id, zend_mcrypt_globals *, v) -#else -# define MCG(v) (mcrypt_globals.v) -#endif +#define MCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mcrypt, v) #else #define mcrypt_module_ptr NULL |