diff options
| author | Anatol Belski <ab@php.net> | 2017-07-21 11:16:38 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-21 11:16:38 +0200 |
| commit | 96ad72dc29cfa1bd6dad9a483adfa8dc5baefbb9 (patch) | |
| tree | 86fb5da3c523e0e5e87e52d5bd8813000ceca608 | |
| parent | 6242230219db18a6ced735b1346c6ddbce393ad5 (diff) | |
| parent | 4b3ed311aae8ee4b6dbb26059b830d22431e9784 (diff) | |
| download | php-git-96ad72dc29cfa1bd6dad9a483adfa8dc5baefbb9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Move the define into the header to reduce diff for future upgrade
| -rw-r--r-- | Zend/zend_strtod.c | 2 | ||||
| -rw-r--r-- | Zend/zend_strtod_int.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c index 50cdba85de..3aa99f8d98 100644 --- a/Zend/zend_strtod.c +++ b/Zend/zend_strtod.c @@ -206,8 +206,6 @@ static void Bug(const char *message) { #include "stdlib.h" #include "string.h" -#define NO_ERRNO - #ifdef USE_LOCALE #include "locale.h" #endif diff --git a/Zend/zend_strtod_int.h b/Zend/zend_strtod_int.h index b9aadabd57..de0754d7e9 100644 --- a/Zend/zend_strtod_int.h +++ b/Zend/zend_strtod_int.h @@ -72,6 +72,10 @@ typedef unsigned long int uint32_t; #define NO_INFNAN_CHECK #endif +#ifndef NO_ERRNO +#define NO_ERRNO +#endif + #ifdef WORDS_BIGENDIAN #define IEEE_BIG_ENDIAN 1 #else |