N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #661 from linkmauve/cleanup

Browse source 
Fix two minor understandability issues in common
This commit is contained in:
bunnei 2015-03-16 20:32:51 -04:00
commit 6977877665
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/common_paths.h
View file

@ -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

6
src/common/platform.h
View file

@ -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>