From ec5ece6caf45ac92262713c99422f257740fbd37 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 13 Apr 2010 11:14:04 +0000
Subject: [PATCH] PHP_OS is now always WINNT on Windows, since we don't support
 anything prior to XP SP2

---
 main/main.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/main/main.c b/main/main.c
index 9827c23d1f5..b781b2975ac 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1745,7 +1745,7 @@ int php_register_extensions(zend_module_entry **ptr, int count TSRMLS_DC)
 }
 /* }}} */
 
-#if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(PHP_WIN32) && _MSC_VER >= 1400
 static _invalid_parameter_handler old_invalid_parameter_handler;
 
 void dummy_invalid_parameter_handler(
@@ -1795,14 +1795,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	WSADATA wsaData;
 #endif
 #ifdef PHP_WIN32
-	DWORD dwVersion = GetVersion();
-	/* Get build numbers for Windows NT or Win95 */
-	if (dwVersion < 0x80000000){
-		php_os="WINNT";
-	} else {
-		php_os="WIN32";
-	}
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+	php_os = "WINNT";
+#if _MSC_VER >= 1400
 	old_invalid_parameter_handler =
 		_set_invalid_parameter_handler(dummy_invalid_parameter_handler);
 	if (old_invalid_parameter_handler != NULL) {