summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2013-10-04 23:31:16 +0200
committerStanislav Malyshev <stas@php.net>2013-12-08 15:49:22 -0800
commitc062c18d426e8b1e4d7e4fabb6a5eae331f6e58b (patch)
treef92ee53420987305553b80e838bf9d135a096abd
parentb5f5bff965c1a27a4820d0129d61f80ef8894e38 (diff)
downloadphp-git-c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b.tar.gz
Replace invalid code with a proper #error
This code creates a nasty error as mentioned in bugs #31131, #37062 Patch taken from Debian's PHP package: 044-strtod_arm_fix
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_strtod.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c601a8af77..ebdf31514e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP NEWS
- Core:
. Added validation of class names in the autoload process. (Dmitry)
+ . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
. Fixed bug #61645 (fopen and O_NONBLOCK). (Mike)
- Date:
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index d6e5ccf960..4546614cfd 100644
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -267,8 +267,7 @@ BEGIN_EXTERN_C()
#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
defined(IBM) != 1
- Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or
- IBM should be defined.
+#error "Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or IBM should be defined."
#endif
typedef union {