From b54e32ef87ab475090abb3731ca8dbb72b7f3448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Sat, 28 May 2016 22:37:54 +0200
Subject: [PATCH] Fixes to network refactoring (#11)

---
 src/common.h                   | 20 +++++++++++---------
 src/network/NetworkAction.h    |  1 +
 src/network/NetworkAddress.cpp |  2 +-
 src/network/NetworkAddress.h   |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/common.h b/src/common.h
index 8663eaa84689..ad7871fca921 100644
--- a/src/common.h
+++ b/src/common.h
@@ -35,16 +35,18 @@
 #endif
 
 #ifdef PLATFORM_X86
-#ifdef __GNUC__
-#define FASTCALL __attribute__((fastcall))
-#elif _MSC_VER
-#define FASTCALL __fastcall
-#else
-#pragma message "Not using fastcall calling convention, please check your compiler support"
-#define FASTCALL
-#endif
+	#ifndef FASTCALL
+		#ifdef __GNUC__
+			#define FASTCALL __attribute__((fastcall))
+		#elif _MSC_VER
+			#define FASTCALL __fastcall
+		#else
+			#pragma message "Not using fastcall calling convention, please check your compiler support"
+			#define FASTCALL
+		#endif
+	#endif // FASTCALL
 #else // PLATFORM_X86
-#define FASTCALL
+	#define FASTCALL
 #endif // PLATFORM_X86
 
 #endif
diff --git a/src/network/NetworkAction.h b/src/network/NetworkAction.h
index 09dba1b40dbc..5c511fd3220b 100644
--- a/src/network/NetworkAction.h
+++ b/src/network/NetworkAction.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <vector>
+#include <string>
 #include "../common.h"
 
 class NetworkAction
diff --git a/src/network/NetworkAddress.cpp b/src/network/NetworkAddress.cpp
index 66b763d1ac93..86bc25f3d4e5 100644
--- a/src/network/NetworkAddress.cpp
+++ b/src/network/NetworkAddress.cpp
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include <string>
-#include <sdl/SDL_thread.h>
+#include <SDL_thread.h>
 #include "NetworkAddress.h"
 
 NetworkAddress::NetworkAddress()
diff --git a/src/network/NetworkAddress.h b/src/network/NetworkAddress.h
index 73a1d14633e1..2b479891ea2f 100644
--- a/src/network/NetworkAddress.h
+++ b/src/network/NetworkAddress.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <memory>
-#include <sdl/SDL_mutex.h>
+#include <SDL_mutex.h>
 #include "NetworkTypes.h"
 #include "../common.h"