Merge branch 'next' into fast

11 years ago · 21e5c0439e
parent 0f648ea3e8 e96dc63f28
commit 21e5c0439e
1 changed files with 4 additions and 0 deletions
--- a/include/mips.h
+++ b/include/mips.h
@ -11,6 +11,10 @@ extern "C" {
 #include <stdint.h>
 #include "platform.h"

+// GCC MIPS toolchain has a default macro called "mips" which breaks
+// compilation
+#undef mips
+
 #ifdef _MSC_VER
 #pragma warning(disable:4201)
 #endif