aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common
diff options
context:
space:
mode:
authorGravatar ShizZy <shizzy@6bit.net>2013-09-23 22:09:26 -0400
committerGravatar ShizZy <shizzy@6bit.net>2013-09-23 22:09:26 -0400
commit00287b7a65fb91114ac9ab473cb57d0bc080d4a2 (patch)
tree50742d5ce8b16982aeaad8cb63d5bdc716e55090 /src/common
parent29cdc1df39c81d7a001053ffca4aa1bc194a3c7b (diff)
removed <windows.h> include from common.h and added it only where needed
Diffstat (limited to 'src/common')
-rw-r--r--src/common/src/common.h4
-rw-r--r--src/common/src/file_sys_directory.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/common/src/common.h b/src/common/src/common.h
index e1cae4fe..0e5bf1cd 100644
--- a/src/common/src/common.h
+++ b/src/common/src/common.h
@@ -50,10 +50,6 @@ private:
#include "common_paths.h"
#include "platform.h"
-#if EMU_PLATFORM == PLATFORM_WINDOWS
-#include <windows.h>
-#endif
-
#ifdef __APPLE__
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
diff --git a/src/common/src/file_sys_directory.cpp b/src/common/src/file_sys_directory.cpp
index c20557ba..79acb181 100644
--- a/src/common/src/file_sys_directory.cpp
+++ b/src/common/src/file_sys_directory.cpp
@@ -24,7 +24,7 @@
#include "utf8.h"
#if EMU_PLATFORM == PLATFORM_WINDOWS
-//#include "Common/CommonWindows.h"
+#include <windows.h>
#include <sys/stat.h>
#else
#include <dirent.h>