From b7db0b7b8fbc0be8a8550851a0a3ef4f71612e66 Mon Sep 17 00:00:00 2001
From: Ludovic Henry <ludovic@xamarin.com>
Date: Wed, 6 Jan 2016 11:23:05 +0000
Subject: [PATCH] [handle] Inline handle-private.h in handle.h

MonoHandleArena functions need to be as public as MonoHandle functions, as we cannot have one without the other.
---
 mono/metadata/Makefile.am          |  3 +--
 mono/metadata/handle-private.h     | 29 -----------------------------
 mono/metadata/handle.c             |  1 -
 mono/metadata/handle.h             | 32 +++++++++++++++++++++++++++-----
 mono/unit-tests/test-mono-handle.c |  1 -
 5 files changed, 28 insertions(+), 38 deletions(-)
 delete mode 100644 mono/metadata/handle-private.h

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index a0d7c20748e..ff8b646fbd6 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -216,8 +216,7 @@ common_sources = \
 	seq-points-data.h	\
 	seq-points-data.c	\
 	handle.c	\
-	handle.h	\
-	handle-private.h
+	handle.h
 
 
 # These source files have compile time dependencies on GC code
diff --git a/mono/metadata/handle-private.h b/mono/metadata/handle-private.h
deleted file mode 100644
index a991b9b47b0..00000000000
--- a/mono/metadata/handle-private.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __MONO_HANDLE_PRIVATE_H__
-#define __MONO_HANDLE_PRIVATE_H__
-
-#include <mono/metadata/handle.h>
-
-typedef struct _MonoHandleArena MonoHandleArena;
-
-gsize
-mono_handle_arena_size (void);
-
-MonoHandle
-mono_handle_arena_new (MonoHandleArena *arena, MonoObject *obj);
-
-MonoHandle
-mono_handle_arena_elevate (MonoHandleArena *arena, MonoHandle handle);
-
-void
-mono_handle_arena_stack_push (MonoHandleArena **arena_stack, MonoHandleArena *arena);
-
-void
-mono_handle_arena_stack_pop (MonoHandleArena **arena_stack, MonoHandleArena *arena);
-
-void
-mono_handle_arena_initialize (MonoHandleArena **arena_stack);
-
-void
-mono_handle_arena_deinitialize (MonoHandleArena **arena_stack);
-
-#endif/*__MONO_HANDLE_PRIVATE_H__*/
diff --git a/mono/metadata/handle.c b/mono/metadata/handle.c
index 885c723be73..eb04ff70e90 100644
--- a/mono/metadata/handle.c
+++ b/mono/metadata/handle.c
@@ -11,7 +11,6 @@
 #include <glib.h>
 
 #include <mono/metadata/handle.h>
-#include <mono/metadata/handle-private.h>
 #include <mono/metadata/object-internals.h>
 #include <mono/metadata/gc-internals.h>
 #include <mono/utils/atomic.h>
diff --git a/mono/metadata/handle.h b/mono/metadata/handle.h
index 82fee80a0fb..800e09c102d 100644
--- a/mono/metadata/handle.h
+++ b/mono/metadata/handle.h
@@ -22,9 +22,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _MonoHandleStorage MonoHandleStorage;
-typedef MonoHandleStorage* MonoHandle;
-
 /*
  * DO NOT ACCESS DIRECTLY
  * USE mono_handle_obj BELOW TO ACCESS OBJ
@@ -32,9 +29,34 @@ typedef MonoHandleStorage* MonoHandle;
  * The field obj is not private as there is no way to do that
  * in C, but using a C++ template would simplify that a lot
  */
-struct _MonoHandleStorage {
+typedef struct {
 	MonoObject *obj;
-};
+} MonoHandleStorage;
+
+typedef MonoHandleStorage* MonoHandle;
+
+typedef struct _MonoHandleArena MonoHandleArena;
+
+gsize
+mono_handle_arena_size (void);
+
+MonoHandle
+mono_handle_arena_new (MonoHandleArena *arena, MonoObject *obj);
+
+MonoHandle
+mono_handle_arena_elevate (MonoHandleArena *arena, MonoHandle handle);
+
+void
+mono_handle_arena_stack_push (MonoHandleArena **arena_stack, MonoHandleArena *arena);
+
+void
+mono_handle_arena_stack_pop (MonoHandleArena **arena_stack, MonoHandleArena *arena);
+
+void
+mono_handle_arena_initialize (MonoHandleArena **arena_stack);
+
+void
+mono_handle_arena_deinitialize (MonoHandleArena **arena_stack);
 
 #ifndef CHECKED_BUILD
 
diff --git a/mono/unit-tests/test-mono-handle.c b/mono/unit-tests/test-mono-handle.c
index 8fa4aed6738..fd916a65906 100644
--- a/mono/unit-tests/test-mono-handle.c
+++ b/mono/unit-tests/test-mono-handle.c
@@ -10,7 +10,6 @@
 #include <config.h>
 #include <glib.h>
 #include <mono/metadata/handle.h>
-#include <mono/metadata/handle-private.h>
 
 static void
 test2_arena_push_pop ()
-- 
2.11.4.GIT