From ed0a0378d788006287091f51178aa7e4a1f285ba Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 8 May 2016 22:27:20 +0200 Subject: [PATCH] Another buildfix --- Common/CommonFuncs.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Common/CommonFuncs.h b/Common/CommonFuncs.h index c26b696af..92e15bfc6 100644 --- a/Common/CommonFuncs.h +++ b/Common/CommonFuncs.h @@ -20,30 +20,27 @@ #include "base/compat.h" #include "CommonTypes.h" -#if defined(IOS) || defined(MIPS) -#include -#endif - template struct CompileTimeAssert; template<> struct CompileTimeAssert {}; -#ifndef _WIN32 +#if !defined(_WIN32) #include #include #if defined(_M_IX86) || defined(_M_X86) - #define Crash() {asm ("int $3");} +#include +#define Crash() {asm ("int $3");} #else - #define Crash() {kill(getpid(), SIGINT);} +#define Crash() {kill(getpid(), SIGINT);} #endif #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0])) inline u32 __rotl(u32 x, int shift) { - shift &= 31; - if (!shift) return x; - return (x << shift) | (x >> (32 - shift)); + shift &= 31; + if (!shift) return x; + return (x << shift) | (x >> (32 - shift)); } inline u64 __rotl64(u64 x, unsigned int shift){