Fixes to network refactoring (OpenRCT2#11)

Goddesen · Jun 1, 2016 · b54e32e · b54e32e
1 parent 5cb81e8
commit b54e32e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <memory>
-#include <sdl/SDL_mutex.h>
+#include <SDL_mutex.h>
 #include "NetworkTypes.h"
 #include "../common.h"