a86098f1 breaks build on ARM 32 (gcc (Ubuntu/Linaro 4.8.2-19ubuntu1) 4.8.2)

gistfile1.txt

a86098f1 breaks build on ARM 32 (gcc (Ubuntu/Linaro 4.8.2-19ubuntu1) 4.8.2)
 
 
The error:
 
In file included from src/moar.h:162:0,
                 from src/main.c:4:
src/core/alloc.h: At top level:
src/core/alloc.h:1:26: error: conflicting types for ‘MVM_malloc’
 MVM_STATIC_INLINE void * MVM_malloc(size_t len) {
                          ^
In file included from src/moar.h:107:0,
                 from src/main.c:4:
src/6model/sc.h:50:15: note: previous implicit declaration of ‘MVM_malloc’ was here
             = MVM_malloc(sizeof(struct MVMSerializationIndex));
               ^
make: *** [src/main.o] Error 1
 
 
The fix:
 
diff --git a/src/moar.h b/src/moar.h
index 2c22f14..4e899b4 100644
--- a/src/moar.h
+++ b/src/moar.h
@@ -104,6 +104,7 @@ typedef double   MVMnum64;
 #include "6model/reprconv.h"
 #include "6model/bootstrap.h"
 #include "6model/containers.h"
+#include "core/alloc.h"
 #include "6model/sc.h"
 #include "6model/serialization.h"
 #include "gc/allocation.h"
@@ -159,7 +160,6 @@ typedef double   MVMnum64;
 #include "profiler/instrument.h"
 #include "profiler/log.h"
 #include "profiler/profile.h"
-#include "core/alloc.h"
 
 MVMObject *MVM_backend_config(MVMThreadContext *tc);