about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Nixon <chris.nixon@sigma.me.uk>2014-08-08 10:37:17 +0100
committerChris Nixon <chris.nixon@sigma.me.uk>2014-08-08 10:42:41 +0100
commitc377f9e3d4ae48d40e3628eb1924cba29b3da016 (patch)
treed0de2e5ad08ea4a3c52274c2997213efcaafc43a
parent8a02304a44bc9d1939b847b824006fcde99ec9e6 (diff)
downloadrust-c377f9e3d4ae48d40e3628eb1924cba29b3da016.tar.gz
rust-c377f9e3d4ae48d40e3628eb1924cba29b3da016.zip
Move system header includes above valgrind.h include
This allows rustc to be build under msys2's mingw64 gcc
-rw-r--r--src/rt/rust_builtin.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c
index 89cb27c1f1a..ba20f2c6f27 100644
--- a/src/rt/rust_builtin.c
+++ b/src/rt/rust_builtin.c
@@ -8,10 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/* Foreign builtins. */
-
-#include "valgrind/valgrind.h"
-
 #include <stdint.h>
 #include <time.h>
 #include <string.h>
@@ -41,6 +37,10 @@
 #endif
 #endif
 
+/* Foreign builtins. */
+//include valgrind.h after stdint.h so that uintptr_t is defined for msys2 w64
+#include "valgrind/valgrind.h"
+
 #ifdef __ANDROID__
 time_t
 timegm(struct tm *tm)