From c689e32856c7564c7a7a28a25d2776e1a65a7f21 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 17 Apr 2016 18:03:13 -0700
Subject: [PATCH] All: Several MSVC build fixes

---
 src/platform/qt/Display.h     | 4 ++++
 src/platform/qt/PaletteView.h | 2 --
 src/util/common.h             | 9 ++++++++-
 src/util/nointro.c            | 3 ++-
 src/util/socket.h             | 3 +--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/platform/qt/Display.h b/src/platform/qt/Display.h
index 6051eee69..841cd4278 100644
--- a/src/platform/qt/Display.h
+++ b/src/platform/qt/Display.h
@@ -6,6 +6,10 @@
 #ifndef QGBA_DISPLAY
 #define QGBA_DISPLAY
 
+extern "C" {
+#include "util/common.h"
+}
+
 #include <QWidget>
 
 #include "MessagePainter.h"
diff --git a/src/platform/qt/PaletteView.h b/src/platform/qt/PaletteView.h
index ef807a565..057d49a5b 100644
--- a/src/platform/qt/PaletteView.h
+++ b/src/platform/qt/PaletteView.h
@@ -13,8 +13,6 @@
 
 #include "ui_PaletteView.h"
 
-class GameController;
-
 namespace QGBA {
 
 class Swatch;
diff --git a/src/util/common.h b/src/util/common.h
index 29301bd5a..c247d6724 100644
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -23,15 +23,22 @@
 
 #include "version.h"
 
+#ifdef _WIN32
+// WinSock2 gets very angry if it's included too late
+#include <winsock2.h>
+#endif
 #ifdef _MSC_VER
+#include <Windows.h>
 #include <sys/types.h>
 typedef intptr_t ssize_t;
-#define inline __inline
+#define PATH_MAX MAX_PATH
 #define restrict __restrict
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 #define ftruncate _chsize
 #define snprintf _snprintf
+#define strdup _strdup
+#define lseek _lseek
 #elif defined(__wii__)
 typedef intptr_t ssize_t;
 #else
diff --git a/src/util/nointro.c b/src/util/nointro.c
index 0cbd436e3..fdf3008b3 100644
--- a/src/util/nointro.c
+++ b/src/util/nointro.c
@@ -158,7 +158,8 @@ struct NoIntroDB* NoIntroDBLoad(struct VFile* vf) {
 	struct {
 		char* key;
 		struct NoIntroItem* item;
-	} keyStack[KEY_STACK_SIZE] = {};
+	} keyStack[KEY_STACK_SIZE];
+	memset(keyStack, 0, sizeof(keyStack));
 	struct Table* parent = 0;
 
 	size_t stackDepth = 0;
diff --git a/src/util/socket.h b/src/util/socket.h
index cbc27374a..5eb2d5d8e 100644
--- a/src/util/socket.h
+++ b/src/util/socket.h
@@ -8,12 +8,11 @@
 
 #include "util/common.h"
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(restrict)
 #define restrict __restrict__
 #endif
 
 #ifdef _WIN32
-#include <winsock2.h>
 #include <ws2tcpip.h>
 
 #define SOCKET_FAILED(s) ((s) == INVALID_SOCKET)