diff options
| author | bunnei <bunneidev@gmail.com> | 2016-05-28 02:50:22 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-05-28 02:50:22 +0200 |
| commit | a2c84d5779a80c61adbf07cfce6c37b0952fea84 (patch) | |
| tree | f827a9867b44520907142600321c115d9e0cbe0f | |
| parent | Merge pull request #1568 from JayFoxRox/fix-printf (diff) | |
| parent | common_funcs: Provide rotr and rotl for MSVC (diff) | |
| download | yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar.gz yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar.bz2 yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar.lz yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar.xz yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.tar.zst yuzu-a2c84d5779a80c61adbf07cfce6c37b0952fea84.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ab3515683..4633897ce 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -72,18 +72,24 @@ inline u64 _rotr64(u64 x, unsigned int shift){ } #else // _MSC_VER - #if (_MSC_VER < 1900) - // Function Cross-Compatibility - #define snprintf _snprintf - #endif - - // Locale Cross-Compatibility - #define locale_t _locale_t - - extern "C" { - __declspec(dllimport) void __stdcall DebugBreak(void); - } - #define Crash() {DebugBreak();} + +#if (_MSC_VER < 1900) + // Function Cross-Compatibility + #define snprintf _snprintf +#endif + +// Locale Cross-Compatibility +#define locale_t _locale_t + +extern "C" { + __declspec(dllimport) void __stdcall DebugBreak(void); +} +#define Crash() {DebugBreak();} + +// cstdlib provides these on MSVC +#define rotr _rotr +#define rotl _rotl + #endif // _MSC_VER ndef // Generic function to get last error message. |