From d66740175eef6f67f2edb364533fa71eaad5ceb7 Mon Sep 17 00:00:00 2001
From: Rémi Verschelde
Date: Sun, 8 Jan 2017 20:41:11 +0100
Subject: Windows: Define _WIN32_WINRT to 0x0600 (Vista)

Passed as a compiler define to be sure it is always define before windows.h
is loaded. This means that Godot officially requires Vista API or later, it will
not work on Windows XP or earlier.

Also fix a bogus check for Windows 7 API.

(cherry picked from commit 6323779596dea0db7f58afef7d3d3d5588ef20cb)
---
 drivers/unix/ip_unix.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'drivers/unix/ip_unix.cpp')

diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index 200eb1dd2..ed11c0686 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -37,19 +37,13 @@
   #ifndef AI_ADDRCONFIG
     #define AI_ADDRCONFIG 0x00000400
   #endif
- #ifdef WINRT_ENABLED
   #include <ws2tcpip.h>
   #include <winsock2.h>
   #include <windows.h>
   #include <stdio.h>
- #else
-  #define WINVER 0x0600
-  #include <ws2tcpip.h>
-  #include <winsock2.h>
-  #include <windows.h>
-  #include <stdio.h>
-  #include <iphlpapi.h>
- #endif
+  #ifndef WINRT_ENABLED
+    #include <iphlpapi.h>
+  #endif
 #else
  #include <netdb.h>
  #ifdef ANDROID_ENABLED
-- 
cgit v1.2.3-70-g09d2