- Fixed bug #52436 (Compile error in pcre if systems do not have stdint.h)

# PCRE's config.h can very well reuse the definitions made available from
# PHP's configure script output available within php_config.h

diff --git a/NEWS b/NEWS
index d0973095d5b71e33f5ebbb85e7fa8d4b8b0ce820..0c2dd0b5695b1b6c7cb4dafae7f785152e75ec9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.3.4
 
+- Fixed bug #52436 (Compile error if systems do not have stdint.h)
+  (Sriram Natarajan)
+
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
 - Upgraded bundled PCRE to version 8.02. (Ilia)

diff --git a/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h
index 34d16a468fb49c0e4e86f4c5c144b3c669f4dc97..277c1e7688a89c2cefd0638e59749f9b4983e64c 100644 (file)
--- a/ext/pcre/pcrelib/config.h
+++ b/ext/pcre/pcrelib/config.h
@@ -1,5 +1,7 @@
 
 #include <php_compat.h>
+#include <php_config.h>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
 #undef PACKAGE_TARNAME
@@ -18,6 +20,8 @@
 # define PCRE_EXP_DATA_DEFN    __attribute__ ((visibility("default")))
 #endif
 
+/* Exclude these below definitions when building within PHP */
+#ifndef ZEND_API
 
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -189,6 +193,9 @@ them both to 0; an emulation function will be used. */
 /* Define to 1 if you have `_strtoi64'. */
 /* #undef HAVE__STRTOI64 */
 
+/* Exclude these above definitions when building within PHP */
+#endif
+
 /* The value of LINK_SIZE determines the number of bytes used to store links
    as offsets within the compiled regex. The default is 2, which allows for
    compiled patterns up to 64K long. This covers the vast majority of cases.