- Fixed bug #31110 and #31111 (Zend/zend_strtod.c problems)

diff --git a/NEWS b/NEWS
index b4b89972ac30b353657e39c7bf3260dca29a3cc2..d76a04710b028a79e014d611541cf736891b4d8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2005, PHP 5.0.4
+- Fixed bug #31111 (Compile failure of zend_strtod.c). (Derick)
+- Fixed bug #31110 (PHP 4.3.10 does not compile on Tru64 UNIX 5.1B). (Derick)
 - Fixed bug #31056 (php_std_date() returns invalid formatted date if 
   y2k_compliance is On). (Ilia)
 

diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 125d072a26d717e3ad4d5d5a098de1e0dfce72c8..4b8c0fcb49fc2125e1a0f46c4f6a5b647fa7a791 100644 (file)
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -96,7 +96,7 @@ static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
-    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
+    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || defined(__alpha) || \
     defined(__powerpc__) || defined(__ppc__) || defined(__m88k__) || \
     defined(__hppa__) || defined(__x86_64__) || (defined(__arm__) && \
     defined(__VFP_FP__))
@@ -128,8 +128,10 @@ static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"
 #endif
 
 #if defined(__sparc__) || defined(__ppc__)
+#ifndef __linux__
 #define u_int32_t uint32_t
 #endif
+#endif
 
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>