[sgen] Fix headers for independent compilation.

diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c
index f84a898af84144b432129b64401613f3cd67f05a..5a14b1a3f3b21044df211e7fdac7dd7cf77e65cd 100644 (file)
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@ -27,6 +27,8 @@
 
 #include <math.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 
 #include "mono/metadata/sgen-gc.h"
 #include "mono/metadata/sgen-protocol.h"
@@ -38,6 +40,7 @@
 #include "mono/metadata/sgen-workers.h"
 #include "mono/metadata/sgen-thread-pool.h"
 #include "mono/metadata/sgen-client.h"
+#include "mono/utils/mono-membar.h"
 
 #if defined(ARCH_MIN_MS_BLOCK_SIZE) && defined(ARCH_MIN_MS_BLOCK_SIZE_SHIFT)
 #define MS_BLOCK_SIZE  ARCH_MIN_MS_BLOCK_SIZE

diff --git a/mono/metadata/sgen-memory-governor.c b/mono/metadata/sgen-memory-governor.c
index 76617706aedaa3905f22b1af32904f90cb03f866..5c9b8373663f2ebabbedffb1aa2ee344064e771b 100644 (file)
--- a/mono/metadata/sgen-memory-governor.c
+++ b/mono/metadata/sgen-memory-governor.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
+#include <stdlib.h>
+
 #include "mono/metadata/sgen-gc.h"
 #include "mono/metadata/sgen-memory-governor.h"
 #include "mono/metadata/sgen-thread-pool.h"

diff --git a/mono/metadata/sgen-thread-pool.c b/mono/metadata/sgen-thread-pool.c
index bff62eb7b42acbd880bc6d03e8ade3c6e2ad4e79..d716038c573be23a41ac627438a1cabf16e14403 100644 (file)
--- a/mono/metadata/sgen-thread-pool.c
+++ b/mono/metadata/sgen-thread-pool.c
@@ -24,7 +24,9 @@
 #include "mono/metadata/sgen-thread-pool.h"
 #include "mono/metadata/sgen-pointer-queue.h"
 #include "mono/utils/mono-mutex.h"
+#ifndef SGEN_WITHOUT_MONO
 #include "mono/utils/mono-threads.h"
+#endif
 
 static mono_mutex_t lock;
 static mono_cond_t work_cond;

diff --git a/mono/metadata/sgen-workers.c b/mono/metadata/sgen-workers.c
index 41ee858459316b6ef3a5e7a252a0fbaf8572e247..cbbd7709007d7a8ef143dabd5229ae49e8f06e02 100644 (file)
--- a/mono/metadata/sgen-workers.c
+++ b/mono/metadata/sgen-workers.c
@@ -22,10 +22,12 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
+#include <string.h>
+
 #include "mono/metadata/sgen-gc.h"
 #include "mono/metadata/sgen-workers.h"
 #include "mono/metadata/sgen-thread-pool.h"
-#include "mono/utils/mono-counters.h"
+#include "mono/utils/mono-membar.h"
 #include "mono/metadata/sgen-client.h"
 
 static int workers_num;