From 6773d631b990241a5c9abbd2ffd303fa9c96f927 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 22 Jan 2016 22:13:16 +0100
Subject: [PATCH] fiasco: remove thread_helper.h from public API

Issue #1832
---
 repos/base-fiasco/src/core/include/ipc_pager.h                | 4 +++-
 repos/base-fiasco/src/core/include/util.h                     | 4 +++-
 repos/base-fiasco/src/core/platform.cc                        | 2 +-
 repos/base-fiasco/src/core/spec/x86/platform_x86.cc           | 2 +-
 .../include/base/internal/fiasco_thread_helper.h}             | 0
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename repos/base-fiasco/{include/fiasco/thread_helper.h => src/include/base/internal/fiasco_thread_helper.h} (100%)

diff --git a/repos/base-fiasco/src/core/include/ipc_pager.h b/repos/base-fiasco/src/core/include/ipc_pager.h
index 62d699af4..ace21ed4e 100644
--- a/repos/base-fiasco/src/core/include/ipc_pager.h
+++ b/repos/base-fiasco/src/core/include/ipc_pager.h
@@ -19,9 +19,11 @@
 #include <base/ipc.h>
 #include <base/stdint.h>
 #include <base/native_types.h>
-#include <fiasco/thread_helper.h>
 #include <util/touch.h>
 
+/* base-internal includes */
+#include <base/internal/fiasco_thread_helper.h>
+
 /* Fiasco includes */
 namespace Fiasco {
 #include <l4/sys/types.h>
diff --git a/repos/base-fiasco/src/core/include/util.h b/repos/base-fiasco/src/core/include/util.h
index 28bebf09e..5d96bba21 100644
--- a/repos/base-fiasco/src/core/include/util.h
+++ b/repos/base-fiasco/src/core/include/util.h
@@ -21,7 +21,9 @@
 #include <base/printf.h>
 #include <rm_session/rm_session.h>
 #include <util/touch.h>
-#include <fiasco/thread_helper.h>
+
+/* base-internal includes */
+#include <base/internal/fiasco_thread_helper.h>
 
 /* Fiasco includes */
 namespace Fiasco {
diff --git a/repos/base-fiasco/src/core/platform.cc b/repos/base-fiasco/src/core/platform.cc
index 3570f44d0..e0bc786e8 100644
--- a/repos/base-fiasco/src/core/platform.cc
+++ b/repos/base-fiasco/src/core/platform.cc
@@ -19,7 +19,7 @@
 
 /* base-internal includes */
 #include <base/internal/crt0.h>
-#include <fiasco/thread_helper.h>
+#include <base/internal/fiasco_thread_helper.h>
 
 /* core includes */
 #include <core_parent.h>
diff --git a/repos/base-fiasco/src/core/spec/x86/platform_x86.cc b/repos/base-fiasco/src/core/spec/x86/platform_x86.cc
index 440bcf60d..9298fe2fd 100644
--- a/repos/base-fiasco/src/core/spec/x86/platform_x86.cc
+++ b/repos/base-fiasco/src/core/spec/x86/platform_x86.cc
@@ -11,7 +11,7 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <fiasco/thread_helper.h>
+#include <base/internal/fiasco_thread_helper.h>
 
 #include "platform.h"
 #include "util.h"
diff --git a/repos/base-fiasco/include/fiasco/thread_helper.h b/repos/base-fiasco/src/include/base/internal/fiasco_thread_helper.h
similarity index 100%
rename from repos/base-fiasco/include/fiasco/thread_helper.h
rename to repos/base-fiasco/src/include/base/internal/fiasco_thread_helper.h