From 48b7036938b1659695c9842c342f7d4808b4efa8 Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Tue, 26 Apr 2016 12:59:16 -0400
Subject: [PATCH] [runtime] Moved MONO_ZERO_LEN_ARRAY to mono-publib.h.

---
 mono/metadata/reflection.h |  2 +-
 mono/utils/mono-compiler.h | 13 -------------
 mono/utils/mono-publib.h   | 12 ++++++++++++
 mono/utils/monobitset.h    |  6 ------
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/mono/metadata/reflection.h b/mono/metadata/reflection.h
index ad28290bcc9..7484759db58 100644
--- a/mono/metadata/reflection.h
+++ b/mono/metadata/reflection.h
@@ -1,7 +1,7 @@
 #ifndef __METADATA_REFLECTION_H__
 #define __METADATA_REFLECTION_H__
 
-#include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-publib.h>
 #include <mono/metadata/object.h>
 
 MONO_BEGIN_DECLS
diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h
index 04bc26e4f53..2b3b86e2ef2 100644
--- a/mono/utils/mono-compiler.h
+++ b/mono/utils/mono-compiler.h
@@ -7,19 +7,6 @@
  */
 #include <config.h>
 
-/*
- * When embedding, you have to define MONO_ZERO_LEN_ARRAY before including any
- * other Mono header file if you use a different compiler from the one used to
- * build Mono.
- */
-#ifndef MONO_ZERO_LEN_ARRAY
-#ifdef __GNUC__
-#define MONO_ZERO_LEN_ARRAY 0
-#else
-#define MONO_ZERO_LEN_ARRAY 1
-#endif
-#endif
-
 #ifdef __GNUC__
 #define MONO_ATTR_USED __attribute__ ((used))
 #else
diff --git a/mono/utils/mono-publib.h b/mono/utils/mono-publib.h
index 30c80704399..53d4aa3ea7f 100644
--- a/mono/utils/mono-publib.h
+++ b/mono/utils/mono-publib.h
@@ -73,6 +73,18 @@ MONO_API void mono_free (void *);
 
 #define MONO_CONST_RETURN const
 
+/*
+ * When embedding, you have to define MONO_ZERO_LEN_ARRAY before including any
+ * other Mono header file if you use a different compiler from the one used to
+ * build Mono.
+ */
+#ifndef MONO_ZERO_LEN_ARRAY
+#ifdef __GNUC__
+#define MONO_ZERO_LEN_ARRAY 0
+#else
+#define MONO_ZERO_LEN_ARRAY 1
+#endif
+#endif
 
 #if defined (MONO_INSIDE_RUNTIME)
 
diff --git a/mono/utils/monobitset.h b/mono/utils/monobitset.h
index e95f4847e6c..682b8d539a3 100644
--- a/mono/utils/monobitset.h
+++ b/mono/utils/monobitset.h
@@ -2,13 +2,7 @@
 #define __MONO_BITSET_H__
 
 #include <glib.h>
-#include <mono/utils/mono-compiler.h>
-
-#ifdef SGEN_WITHOUT_MONO
-#define MONO_API
-#else
 #include <mono/utils/mono-publib.h>
-#endif
 
 #define MONO_BITSET_BITS_PER_CHUNK (8 * sizeof (gsize))
 
-- 
2.25.1