Imported Upstream version 5.3.5upstream/5.3.5

4 files changed, 14 insertions, 13 deletions

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 837fcc863..998724a17 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -14,10 +14,10 @@
 #  | Author: Wez Furlong <wez@thebrainroom.com>                           |
 #  +----------------------------------------------------------------------+
 #
-# $Id: Makefile 289763 2009-10-19 19:02:12Z pajoye $
+# $Id: Makefile 302247 2010-08-15 03:38:08Z pajoye $
 # This is the makefile template for the win32 build
 
-CC="$(CL)"
+CC="$(PHP_CL)"
 LD="$(LINK)"
 MC="$(MC)"
 MT="$(MT)"
@@ -146,7 +146,7 @@ dist: all build-dist
 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)"
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 5f10c7e6a..a4e768fff 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -1,11 +1,11 @@
 // vim:ft=javascript
-// $Id: config.w32 291639 2009-12-03 11:50:32Z kalle $
+// $Id: config.w32 305923 2010-12-02 23:23:14Z pajoye $
 // "Master" config file; think of it as a configure.in
 // 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 @@ if (!CL) {
 // 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, null, 'PHP_CL');
 if (X64) {
 	STDOUT.WriteLine("  Detected 64-bit compiler");
 } else {
@@ -104,7 +104,7 @@ ARG_ENABLE('zts', 'Thread safety', 'yes');
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
-	PHP_PREFIX = "C:\\php" + PHP_VERSION;
+	PHP_PREFIX = "C:\\php";
 	if (PHP_DEBUG == "yes")
 		PHP_PREFIX += "\\debug";
 }
@@ -349,7 +349,7 @@ ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c plain_wrapper.c
 	userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
 
 ADD_SOURCES("win32", "glob.c readdir.c \
-	registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c globals.c");
+	registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
 
 STDOUT.WriteBlankLines(1);
 
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 27ff05258..4c16b1adc 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -1,6 +1,6 @@
 /*
 	Build Configuration Template for Win32.
-	$Id: config.w32.h.in 291951 2009-12-10 14:08:19Z pajoye $
+	$Id: config.w32.h.in 305778 2010-11-26 18:25:13Z pajoye $
 */
 
 /* Define the minimum supported version */
@@ -58,6 +58,7 @@
 /* its in win32/time.c */
 #define HAVE_USLEEP 1
 #define HAVE_NANOSLEEP 1
+#define PHP_SLEEP_NON_VOID 1
 
 #define HAVE_GETHOSTNAME 1
 #define HAVE_GETCWD 1
diff --git a/win32/build/template.rc b/win32/build/template.rc
index 98c2bcb4f..58cbb991d 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc 281570 2009-06-03 01:14:58Z kalle $
+ * $Id: template.rc 302265 2010-08-15 13:40:29Z pajoye $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -65,7 +65,7 @@ BEGIN
 #endif
             VALUE "FileVersion", EXT_VERSION
             VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", "Copyright © 1997-2009 The PHP Group"
+            VALUE "LegalCopyright", "Copyright © 1997-2010 The PHP Group"
             VALUE "LegalTrademarks", "PHP"
             VALUE "OriginalFilename", FILE_NAME
             VALUE "ProductName", "PHP"