Merge pull request #661 from linkmauve/cleanup
Fix two minor understandability issues in common
This commit is contained in:
commit
6977877665
|
@ -17,13 +17,12 @@
|
||||||
|
|
||||||
// The user data dir
|
// The user data dir
|
||||||
#define ROOT_DIR "."
|
#define ROOT_DIR "."
|
||||||
#ifdef _WIN32
|
#define USERDATA_DIR "user"
|
||||||
#define USERDATA_DIR "user"
|
#ifdef USER_DIR
|
||||||
#define EMU_DATA_DIR "Citra Emulator"
|
#define EMU_DATA_DIR USER_DIR
|
||||||
#else
|
#else
|
||||||
#define USERDATA_DIR "user"
|
#ifdef _WIN32
|
||||||
#ifdef USER_DIR
|
#define EMU_DATA_DIR "Citra Emulator"
|
||||||
#define EMU_DATA_DIR USER_DIR
|
|
||||||
#else
|
#else
|
||||||
#define EMU_DATA_DIR "citra-emu"
|
#define EMU_DATA_DIR "citra-emu"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -83,7 +83,7 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
#else // EMU_PLATFORM != PLATFORM_WINDOWS
|
||||||
|
|
||||||
#define EMU_FASTCALL __attribute__((fastcall))
|
#define EMU_FASTCALL __attribute__((fastcall))
|
||||||
#define __stdcall
|
#define __stdcall
|
||||||
|
@ -92,10 +92,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
|
||||||
#define BOOL bool
|
#define BOOL bool
|
||||||
#define DWORD u32
|
#define DWORD u32
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EMU_PLATFORM != PLATFORM_WINDOWS
|
|
||||||
|
|
||||||
// TODO: Hacks..
|
// TODO: Hacks..
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
|
Reference in New Issue