removed <windows.h> include from common.h and added it only where needed
This commit is contained in:
parent
29cdc1df39
commit
00287b7a65
|
@ -50,10 +50,6 @@ private:
|
||||||
#include "common_paths.h"
|
#include "common_paths.h"
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
|
||||||
#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
|
// 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.
|
// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
|
|
||||||
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
||||||
//#include "Common/CommonWindows.h"
|
#include <windows.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#else
|
#else
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
//teawater add for arm2x86 2005.02.14-------------------------------------------
|
//teawater add for arm2x86 2005.02.14-------------------------------------------
|
||||||
// koodailar remove it for mingw 2005.12.18----------------
|
// koodailar remove it for mingw 2005.12.18----------------
|
||||||
//anthonylee modify it for portable 2007.01.30
|
//anthonylee modify it for portable 2007.01.30
|
||||||
|
|
Reference in New Issue