MFH: - Use correct header files (in c99 compliant way). uint32_t is preferred.

diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index bba9ac7edb0b298a64031314749187d62c7e92ba..1d502c3c94bdee098a7a443ed3cc1617a1fbd7dd 100644 (file)
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -91,6 +91,12 @@
 
 #include <zend_strtod.h>
 
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -116,23 +122,16 @@
 
 #if defined(_MSC_VER)
 #define int32_t __int32
-#define u_int32_t unsigned __int32
+#define uint32_t unsigned __int32
 #define IEEE_LITTLE_ENDIAN
 #endif
 
-#if defined(__sparc__) || defined(__ppc__) || defined(__sun__) || \
-       defined(__hpux) || defined(__hppa)
-#ifndef __linux__
-#define u_int32_t uint32_t
-#endif
-#endif
-
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
 
 #define Long   int32_t
-#define ULong  u_int32_t
+#define ULong  uint32_t
 
 #ifdef __cplusplus
 #include "malloc.h"

diff --git a/configure.in b/configure.in
index 7dd063ec2931f3062443fce018a884f41c1bac56..04f888244307656aaa68d7430a8900735813b4ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -332,6 +332,8 @@ AC_HEADER_DIRENT
 PHP_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS([ \
+inttypes.h \
+stdint.h \
 dirent.h \
 ApplicationServices/ApplicationServices.h \
 sys/param.h \