diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/bcmath/php_bcmath.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/bcmath/php_bcmath.h')
| -rw-r--r-- | ext/bcmath/php_bcmath.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 12098cff89..6647894bf0 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -49,7 +49,10 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath) ZEND_END_MODULE_GLOBALS(bcmath) #ifdef ZTS -# define BCG(v) TSRMG(bcmath_globals_id, zend_bcmath_globals *, v) +# define BCG(v) ZEND_TSRMG(bcmath_globals_id, zend_bcmath_globals *, v) +# ifdef COMPILE_DL_BCMATH +ZEND_TSRMLS_CACHE_EXTERN; +# endif #else # define BCG(v) (bcmath_globals.v) #endif |