1
0
mirror of https://github.com/php/php-src.git synced 2026-04-02 13:43:02 +02:00

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Replace invalid code with a proper #error
This commit is contained in:
Stanislav Malyshev
2013-12-08 15:50:08 -08:00
2 changed files with 2 additions and 2 deletions

1
NEWS
View File

@@ -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 #66041 (list() fails to unpack yielded ArrayAccess object).
(Nikita)
. Fixed bug #65764 (generators/throw_rethrow FAIL with

View File

@@ -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 {