From 118a2fa8d974f593aa886a9e088a0c965e3c881c Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sat, 4 Apr 2015 22:04:32 +0200
Subject: [PATCH] This part here was moved to the EG constructor by Anatol in
 f51a9c71dd011f7d6879b326280adc05ae45f7f7

---
 main/main.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/main/main.c b/main/main.c
index c7468c2a96..08f415173d 100644
--- a/main/main.c
+++ b/main/main.c
@@ -57,7 +57,7 @@
 #include "zend_extensions.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "php_main.h"
+#include "php_main.h
 #include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/php_string.h"
@@ -2057,19 +2057,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	zuf.resolve_path_function = php_resolve_path_for_zend;
 	zend_startup(&zuf, NULL);
 
-#ifdef PHP_WIN32
-	{
-		OSVERSIONINFOEX *osvi = &EG(windows_version_info);
-
-		ZeroMemory(osvi, sizeof(OSVERSIONINFOEX));
-		osvi->dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-		if( !GetVersionEx((OSVERSIONINFO *) osvi)) {
-			php_printf("\nGetVersionEx unusable. %d\n", GetLastError());
-			return FAILURE;
-		}
-	}
-#endif
-
 #if HAVE_SETLOCALE
 	setlocale(LC_CTYPE, "");
 	zend_update_current_locale();
-- 
2.40.0