diff options
| author | 2013-09-23 22:09:26 -0400 | |
|---|---|---|
| committer | 2013-09-23 22:09:26 -0400 | |
| commit | 00287b7a65fb91114ac9ab473cb57d0bc080d4a2 (patch) | |
| tree | 50742d5ce8b16982aeaad8cb63d5bdc716e55090 /src/common | |
| parent | moved file_sys to common (diff) | |
| download | yuzu-00287b7a65fb91114ac9ab473cb57d0bc080d4a2.tar.gz yuzu-00287b7a65fb91114ac9ab473cb57d0bc080d4a2.tar.xz yuzu-00287b7a65fb91114ac9ab473cb57d0bc080d4a2.zip | |
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.h | 4 | ||||
| -rw-r--r-- | src/common/src/file_sys_directory.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/common/src/common.h b/src/common/src/common.h index e1cae4fee..0e5bf1cd3 100644 --- a/src/common/src/common.h +++ b/src/common/src/common.h | |||
| @@ -50,10 +50,6 @@ private: | |||
| 50 | #include "common_paths.h" | 50 | #include "common_paths.h" |
| 51 | #include "platform.h" | 51 | #include "platform.h" |
| 52 | 52 | ||
| 53 | #if EMU_PLATFORM == PLATFORM_WINDOWS | ||
| 54 | #include <windows.h> | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #ifdef __APPLE__ | 53 | #ifdef __APPLE__ |
| 58 | // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. | 54 | // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. |
| 59 | // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes. | 55 | // 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 c20557bad..79acb181c 100644 --- a/src/common/src/file_sys_directory.cpp +++ b/src/common/src/file_sys_directory.cpp | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include "utf8.h" | 24 | #include "utf8.h" |
| 25 | 25 | ||
| 26 | #if EMU_PLATFORM == PLATFORM_WINDOWS | 26 | #if EMU_PLATFORM == PLATFORM_WINDOWS |
| 27 | //#include "Common/CommonWindows.h" | 27 | #include <windows.h> |
| 28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
| 29 | #else | 29 | #else |
| 30 | #include <dirent.h> | 30 | #include <dirent.h> |