From: Pierre Joye <pajoye@php.net>
Date: Sun, 6 Jul 2008 09:55:44 +0000 (+0000)
Subject: - correctly test the VCVERS (four digits now)
X-Git-Tag: php-5.3.0alpha1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21bca5add33a7f74527d8021d99adc953124bcfa;p=php

- correctly test the VCVERS (four digits now)
---

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index aefcabc2a3..764551c847 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -144,7 +144,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
 DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS");
 
-if (VCVERS < 14) {
+if (VCVERS < 1400) {
 	// Enable automatic precompiled headers
 	ADD_FLAG('CFLAGS', ' /YX ');
 
@@ -154,7 +154,7 @@ if (VCVERS < 14) {
 	}
 }
 
-if (VCVERS >= 14) {
+if (VCVERS >= 1400) {
 	// fun stuff: MS deprecated ANSI stdio and similar functions
 	// disable annoying warnings.  In addition, time_t defaults
 	// to 64-bit.  Ask for 32-bit.
@@ -301,7 +301,7 @@ function add_extra_dirs()
 		for (i = 0; i < path.length; i++) {
 			f = FSO.GetAbsolutePathName(path[i]);
 			if (FSO.FolderExists(f)) {
-				if (VCVERS <= 12 && f.indexOf(" ") >= 0) {
+				if (VCVERS <= 1200 && f.indexOf(" ") >= 0) {
 					ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" ');
 				} else {
 					ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');