summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2004-12-16 10:38:30 +0000
committerDerick Rethans <derick@php.net>2004-12-16 10:38:30 +0000
commit68010fd314bd29c49173ed57989eba850d9cb07f (patch)
tree8af5aded26e62297436ad82f5370de1ae2d508aa
parent3bb2ce51c5f088428b737b8c0ae14242b179e34a (diff)
downloadphp-git-68010fd314bd29c49173ed57989eba850d9cb07f.tar.gz
- Fixed bug #31110 and #31111 (Zend/zend_strtod.c problems)
-rw-r--r--NEWS2
-rw-r--r--Zend/zend_strtod.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b4b89972ac..d76a04710b 100644
--- 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 125d072a26..4b8c0fcb49 100644
--- 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>