diff options
Diffstat (limited to 'src/common/common_funcs.h')
-rw-r--r-- | src/common/common_funcs.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ddf3958cc..c2750a63c 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -1,9 +1,12 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version // Refer to the license.txt file included. #pragma once +#include "common_types.h" +#include <cstdlib> + #ifdef _WIN32 #define SLEEP(x) Sleep(x) #else @@ -73,6 +76,8 @@ inline u64 _rotr64(u64 x, unsigned int shift){ } #else // _MSC_VER +#include <locale.h> + // Function Cross-Compatibility #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -106,7 +111,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){ // Restore the global locale _configthreadlocale(_DISABLE_PER_THREAD_LOCALE); } - else if(new_locale != NULL) + else if(new_locale != nullptr) { // Configure the thread to set the locale only for this thread _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); |