Remove base/native_types.h headers

Issue #1993

repos/base-linux/include/base/native_capability.h

@@ -1,5 +1,5 @@
 /*
- * \brief  Native types
+ * \brief  Native capability type
  * \author Norman Feske
  * \date   2007-10-15
  */
@@ -11,11 +11,11 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
-#define _INCLUDE__BASE__NATIVE_TYPES_H_
+#ifndef _INCLUDE__BASE__NATIVE_CAPABILITY_H_
+#define _INCLUDE__BASE__NATIVE_CAPABILITY_H_
 
 #include <util/string.h>
-#include <base/native_capability.h>
+#include <base/native_capability_tpl.h>
 #include <base/stdint.h>
 
 namespace Genode {
@@ -40,8 +40,6 @@ namespace Genode {
 	};
 
 	typedef Native_capability_tpl<Cap_dst_policy> Native_capability;
-
-	enum { PARENT_SOCKET_HANDLE = 100 };
 }
 
-#endif /* _INCLUDE__BASE__NATIVE_TYPES_H_ */
+#endif /* _INCLUDE__BASE__NATIVE_CAPABILITY_H_ */

repos/base-linux/src/core/native_pd_component.cc

@@ -20,6 +20,9 @@
 #include <pd_session_component.h>
 #include <dataspace_component.h>
 
+/* base-internal includes */
+#include <base/internal/parent_socket_handle.h>
+
 /* Linux includes */
 #include <core_linux_syscalls.h>
 

repos/base-linux/src/core/platform.cc

@@ -17,6 +17,7 @@
 
 /* base-internal includes */
 #include <base/internal/native_thread.h>
+#include <base/internal/parent_socket_handle.h>
 
 /* local includes */
 #include "platform.h"

repos/base-linux/src/include/base/internal/lock_helper.h

@@ -21,7 +21,6 @@
 #define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
 
 /* Genode includes */
-#include <base/native_types.h>
 #include <base/thread.h>
 
 /* Linux includes */

repos/base-linux/src/include/base/internal/parent_socket_handle.h

@@ -0,0 +1,19 @@
+/*
+ * \brief  Socket handle that refers to the component's parent
+ * \author Norman Feske
+ * \date   2016-06-13
+ */
+
+/*
+ * Copyright (C) 2016 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+#ifndef _INCLUDE__BASE__INTERNAL__PARENT_SOCKET_HANDLE_H_
+#define _INCLUDE__BASE__INTERNAL__PARENT_SOCKET_HANDLE_H_
+
+namespace Genode { enum { PARENT_SOCKET_HANDLE = 100 }; }
+
+#endif /* _INCLUDE__BASE__INTERNAL__PARENT_SOCKET_HANDLE_H_ */

repos/base-linux/src/lib/base/platform_env.cc

@@ -21,6 +21,7 @@
 #include <base/internal/platform_env.h>
 #include <base/internal/native_thread.h>
 #include <base/internal/globals.h>
+#include <base/internal/parent_socket_handle.h>
 
 using namespace Genode;