[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/NEWS ext/pcre/pcrelib/NON-UNIX-USE ext/pcre/pcrelib/config.h ext/pcre/pcrelib/doc/pcre.txt ext/pcre/pcrel
iliaaSat, 14 Aug 2010 14:37:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302210 Log: MFH: Upgraded bundled PCRE to version 8.10. Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/ChangeLog U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NEWS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NON-UNIX-USE U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/doc/pcre.txt U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_chartables.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_compile.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_exec.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_printint.src U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_study.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_tables.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_xclass.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcreposix.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcreposix.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput10 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput6 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput9 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput10 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput6 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput9 diffs exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h trunk/ext/sqlite3/libsqlite/sqlite3.c trunk/ext/sql
iliaaSat, 14 Aug 2010 14:44:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302211 Log: Upgraded bundled Sqlite3 to version 3.7.0.1 Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h diffs exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/ config.h pcre_internal.h
iliaaSat, 14 Aug 2010 14:47:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=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
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile config.w32
pajoye Sun, 15 Aug 2010 03:38:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=302247
Log:
- #52607, fix ENV conflit with win SDK 7.1
Bug: http://bugs.php.net/52607 (Feedback) PHP won't compile with VS2010
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 01:58:36 UTC
(rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 03:38:08 UTC
(rev 302247)
@@ -17,7 +17,7 @@
# $Id$
# This is the makefile template for the win32 build
-CC=$(CL)
+CC=$(PHP_CL)
LD=$(LINK)
MC=$(MC)
MT=$(MT)
@@ -146,7 +146,7 @@
snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe:win32\build\deplister.c
- $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
+ $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS)
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 01:58:36 UTC
(rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 03:38:08 UTC
(rev 302247)
@@ -4,8 +4,8 @@
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-CL = PATH_PROG('cl');
-if (!CL) {
+PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
+if (!PHP_CL) {
ERROR(MS C++ compiler is required);
}
@@ -17,14 +17,14 @@
// 1500 is vs.net 2008
// 1600 is vs.net 2010
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine( Detected compiler + VC_VERSIONS[VCVERS]);
AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
DEFINE(PHP_COMPILER_SHORT, VC_VERSIONS_SHORT[VCVERS]);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], Compiler
compatibility ID);
// do we use x64 or 80x86 version of compiler?
-X64 = probe_binary(CL, 64);
+X64 = probe_binary(PHP_CL, 64);
if (X64) {
STDOUT.WriteLine( Detected 64-bit compiler);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
