Commit:    c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b
Author:    Lior Kaplan <kaplanl...@gmail.com>         Fri, 4 Oct 2013 23:31:16 
+0200
Committer: Stanislav Malyshev <s...@php.net>      Sun, 8 Dec 2013 15:49:22 -0800
Parents:   b5f5bff965c1a27a4820d0129d61f80ef8894e38
Branches:  PHP-5.4 PHP-5.5 PHP-5.6 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b

Log:
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

Bugs:
https://bugs.php.net/31131
https://bugs.php.net/37062

Changed paths:
  M  NEWS
  M  Zend/zend_strtod.c


Diff:
diff --git a/NEWS b/NEWS
index c601a8a..ebdf315 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 d6e5ccf..4546614 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 {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to