diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/bcmath/php_bcmath.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/bcmath/php_bcmath.h')
| -rw-r--r-- | ext/bcmath/php_bcmath.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 6647894bf0..b60fa3f438 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -47,7 +47,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath) bc_num _two_; zend_long bc_precision; ZEND_END_MODULE_GLOBALS(bcmath) - + #ifdef ZTS # define BCG(v) ZEND_TSRMG(bcmath_globals_id, zend_bcmath_globals *, v) # ifdef COMPILE_DL_BCMATH |