- 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/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h
index a3d7e8dae321150d19bb6cfb0c7c525fc76c681e..5f8a81be68d3066aa7185b206d574e4114e56de6 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.