From e053d30bf75f311778ad745f7859a9733d6ce2e3 Mon Sep 17 00:00:00 2001
From: darkf <lw9k123@gmail.com>
Date: Sat, 15 Aug 2015 23:41:40 -0700
Subject: Fix building under MinGW
---
src/common/common_funcs.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'src/common/common_funcs.h')
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 88e452a169..ed20c36297 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -45,14 +45,20 @@
// GCC 4.8 defines all the rotate functions now
// Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit
-#ifndef _rotl
-inline u32 _rotl(u32 x, int shift) {
+#ifdef _rotl
+#define rotl _rotl
+#else
+inline u32 rotl(u32 x, int shift) {
shift &= 31;
if (!shift) return x;
return (x << shift) | (x >> (32 - shift));
}
+#endif
-inline u32 _rotr(u32 x, int shift) {
+#ifdef _rotr
+#define rotr _rotr
+#else
+inline u32 rotr(u32 x, int shift) {
shift &= 31;
if (!shift) return x;
return (x >> shift) | (x << (32 - shift));
--
cgit v1.2.3-70-g09d2