From c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 4 Oct 2013 23:31:16 +0200 Subject: [PATCH] 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 --- NEWS | 1 + Zend/zend_strtod.c | 3 +-- 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 { -- 2.40.0