diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-07-21 11:58:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-07-21 11:58:07 +0800 |
| commit | 84926a0d71d1254c41070ec6818dabcd57ef5d5b (patch) | |
| tree | 8d5c0e5e9b8eee9bca24dccc4e6a1921bb3fceb5 /Zend/zend_strtod.c | |
| parent | fa33b065acb4b70e2d0020f5d379f1eac9e1c3ce (diff) | |
| parent | 95d2908814585bd9c3c9a1eab4989bc551b6cc73 (diff) | |
| download | php-git-84926a0d71d1254c41070ec6818dabcd57ef5d5b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
Diffstat (limited to 'Zend/zend_strtod.c')
| -rw-r--r-- | Zend/zend_strtod.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c index 3aa99f8d98..50cdba85de 100644 --- a/Zend/zend_strtod.c +++ b/Zend/zend_strtod.c @@ -206,6 +206,8 @@ static void Bug(const char *message) { #include "stdlib.h" #include "string.h" +#define NO_ERRNO + #ifdef USE_LOCALE #include "locale.h" #endif |