Win32 build fixes

diff --git a/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h
index a3d7e8dae321150d19bb6cfb0c7c525fc76c681e..43bfa44053fd8bde4c1ce0d9d9c934b0ad0ee414 100644 (file)
--- a/ext/pcre/pcrelib/config.h
+++ b/ext/pcre/pcrelib/config.h
@@ -1,5 +1,10 @@
 
 #include <php_compat.h>
+
+#ifndef PHP_WIN32
+# include <php_config.h>
+#endif
+
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
 #undef PACKAGE_TARNAME
@@ -18,6 +23,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 +196,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.

diff --git a/ext/pcre/pcrelib/pcre_internal.h b/ext/pcre/pcrelib/pcre_internal.h
index e293602fe6a37722ac04048494d87805b9dc5361..039a14094586c80fa01fa235be25d7779e00bc97 100644 (file)
--- a/ext/pcre/pcrelib/pcre_internal.h
+++ b/ext/pcre/pcrelib/pcre_internal.h
@@ -192,7 +192,9 @@ stdint.h is available, include it; it may define INT64_MAX. Systems that do not
 have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
 by "configure". */
 
-#if HAVE_STDINT_H
+#ifdef PHP_WIN32
+#include "win32/php_stdint.h"
+#elif HAVE_STDINT_H
 #include <stdint.h>
 #elif HAVE_INTTYPES_H
 #include <inttypes.h>