Skip to content

Commit

Permalink
Another buildfix
Browse files Browse the repository at this point in the history
  • Loading branch information
hrydgard committed May 8, 2016
1 parent 4e52f61 commit ed0a037
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions Common/CommonFuncs.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,27 @@
#include "base/compat.h"
#include "CommonTypes.h"

#if defined(IOS) || defined(MIPS)
#include <signal.h>
#endif

template <bool> struct CompileTimeAssert;
template<> struct CompileTimeAssert<true> {};

#ifndef _WIN32
#if !defined(_WIN32)

#include <unistd.h>
#include <errno.h>

#if defined(_M_IX86) || defined(_M_X86)
#define Crash() {asm ("int $3");}
#include <signal.h>

This comment has been minimized.

Copy link
@unknownbrackets

unknownbrackets May 8, 2016

Collaborator

I think this was meant to go under the #else.

-[Unknown]

This comment has been minimized.

Copy link
@hrydgard

hrydgard May 8, 2016

Author Owner

Ugh, oops...

#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){
Expand Down

0 comments on commit ed0a037

Please sign in to comment.