iliaa Sat, 14 Aug 2010 14:47:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302213
Log:
Win32 build fixes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h
U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h 2010-08-14
14:47:23 UTC (rev 302212)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h 2010-08-14
14:47:49 UTC (rev 302213)
@@ -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 @@
/* 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.
Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
2010-08-14 14:47:23 UTC (rev 302212)
+++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h
2010-08-14 14:47:49 UTC (rev 302213)
@@ -192,7 +192,9 @@
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>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
