From 8bb6aa2c51371d2a73d05e4f729cddd8d5eb85a3 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Fri, 9 Aug 2019 02:46:29 +0300
Subject: [PATCH] engine: don't include windows headers, as they globally
 included by port.h already

---
 common/port.h                    | 21 +++++++--------------
 engine/client/input.c            |  4 ----
 engine/common/imagelib/img_png.c |  4 +---
 engine/common/net_ws.c           |  1 -
 engine/platform/win32/sys_win.c  |  1 -
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/common/port.h b/common/port.h
index 0649c551..0c1a90f6 100644
--- a/common/port.h
+++ b/common/port.h
@@ -20,11 +20,8 @@ GNU General Public License for more details.
 #include "build.h"
 
 #if !defined(_WIN32)
-	#include <limits.h>
 	#include <dlfcn.h>
-	#include <stdlib.h>
 	#include <unistd.h>
-	#include <string.h>
 
 	#define PATH_SPLITTER "/"
 
@@ -124,19 +121,15 @@ GNU General Public License for more details.
 	#define OS_LIB_PREFIX ""
 	#define OS_LIB_EXT "dll"
 	#define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT
-#ifdef XASH_64BIT
-// windows NameForFunction not implemented yet
-#define XASH_ALLOW_SAVERESTORE_OFFSETS
-#endif
+	#ifdef XASH_64BIT
+		// windows NameForFunction not implemented yet
+		#define XASH_ALLOW_SAVERESTORE_OFFSETS
+	#endif
 #endif //WIN32
 
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-
-#ifndef USHRT_MAX
-#define USHRT_MAX 65535
-#endif
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
 
 #if defined XASH_SDL && !defined REF_DLL
 #include <SDL.h>
diff --git a/engine/client/input.c b/engine/client/input.c
index d549c3fe..c9bf7746 100644
--- a/engine/client/input.c
+++ b/engine/client/input.c
@@ -22,10 +22,6 @@ GNU General Public License for more details.
 #include <SDL.h>
 #endif
 
-#ifdef _WIN32
-#include "windows.h"
-#endif
-
 #include "platform/platform.h"
 
 void*		in_mousecursor;
diff --git a/engine/common/imagelib/img_png.c b/engine/common/imagelib/img_png.c
index f67a2515..f56c5c9b 100644
--- a/engine/common/imagelib/img_png.c
+++ b/engine/common/imagelib/img_png.c
@@ -17,9 +17,7 @@ GNU General Public License for more details.
 #include "miniz.h"
 #include "imagelib.h"
 #include "mathlib.h"
-#ifdef _WIN32
-#include <winsock2.h>
-#else
+#ifndef _WIN32
 #include <netinet/in.h>
 #endif
 
diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c
index d66145bf..8ffb963d 100644
--- a/engine/common/net_ws.c
+++ b/engine/common/net_ws.c
@@ -19,7 +19,6 @@ GNU General Public License for more details.
 #include "mathlib.h"
 #ifdef _WIN32
 // Winsock
-#include <winsock2.h>
 #include <WS2tcpip.h>
 #else
 // BSD sockets
diff --git a/engine/platform/win32/sys_win.c b/engine/platform/win32/sys_win.c
index cea2a676..fd1d3754 100644
--- a/engine/platform/win32/sys_win.c
+++ b/engine/platform/win32/sys_win.c
@@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
-#include <windows.h>
 #include "platform/platform.h"
 #include "menu_int.h"