C: minor fixes for Linux

konsoletyper · Sep 7, 2019 · 5643e82 · 5643e82
1 parent a53f59e
commit 5643e82
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/core/src/main/resources/org/teavm/backend/c/core.h b/core/src/main/resources/org/teavm/backend/c/core.h
@@ -7,6 +7,11 @@
 #include "memory.h"
 #include "exceptions.h"
 
+#if TEAVM_MEMORY_TRACE
+    #include "heaptrace.h"
+    #include <stdlib.h>
+#endif
+
 typedef struct TeaVM_Object {
     int32_t header;
     int32_t hash;

diff --git a/core/src/main/resources/org/teavm/backend/c/definitions.h b/core/src/main/resources/org/teavm/backend/c/definitions.h
@@ -26,6 +26,7 @@
 #ifdef __GNUC__
     #undef TEAVM_UNIX
     #define TEAVM_UNIX 1
+    #include <stdalign.h>
 #endif
 
 #ifndef TEAVM_USE_SETJMP

diff --git a/core/src/main/resources/org/teavm/backend/c/exceptions.h b/core/src/main/resources/org/teavm/backend/c/exceptions.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "definitions.h"
 #include <stdint.h>
+#include <stddef.h>
 
 #if TEAVM_USE_SETJMP
     #include <setjmp.h>

diff --git a/core/src/main/resources/org/teavm/backend/c/heaptrace.c b/core/src/main/resources/org/teavm/backend/c/heaptrace.c
@@ -1,6 +1,7 @@
 #include "heaptrace.h"
 #include "core.h"
 #include "definitions.h"
+#include "memory.h"
 #include <string.h>
 #include <stdint.h>
 #include <inttypes.h>

diff --git a/core/src/main/resources/org/teavm/backend/c/memory.c b/core/src/main/resources/org/teavm/backend/c/memory.c
@@ -11,6 +11,10 @@
     #include <Windows.h>
 #endif
 
+#if TEAVM_MEMORY_TRACE
+    #include "heaptrace.h"
+#endif
+
 void* teavm_gc_heapAddress = NULL;
 void* teavm_gc_gcStorageAddress = NULL;
 int32_t teavm_gc_gcStorageSize = INT32_C(0);