From 35cf51550c32869deb2225442bb75f9fef4d262e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 20 Dec 2005 16:07:27 +0000
Subject: [PATCH] Replaced arch/thread_struct.h with arch/thread_types.h, and
 renamed arch/*/thread_struct.h to arch_thread_types.h, so that it can
 directly be included without having to specify the architecure.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15616 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../{thread_struct.h => arch_thread_types.h}  |  6 ++--
 headers/private/kernel/arch/thread_struct.h   | 30 -------------------
 headers/private/kernel/arch/thread_types.h    | 10 +++++++
 .../{thread_struct.h => arch_thread_types.h}  |  6 ++--
 headers/private/kernel/thread_types.h         |  2 +-
 5 files changed, 17 insertions(+), 37 deletions(-)
 rename headers/private/kernel/arch/ppc/{thread_struct.h => arch_thread_types.h} (70%)
 delete mode 100644 headers/private/kernel/arch/thread_struct.h
 create mode 100644 headers/private/kernel/arch/thread_types.h
 rename headers/private/kernel/arch/x86/{thread_struct.h => arch_thread_types.h} (88%)

diff --git a/headers/private/kernel/arch/ppc/thread_struct.h b/headers/private/kernel/arch/ppc/arch_thread_types.h
similarity index 70%
rename from headers/private/kernel/arch/ppc/thread_struct.h
rename to headers/private/kernel/arch/ppc/arch_thread_types.h
index e237ae78ae..96fb0bda74 100644
--- a/headers/private/kernel/arch/ppc/thread_struct.h
+++ b/headers/private/kernel/arch/ppc/arch_thread_types.h
@@ -2,8 +2,8 @@
 ** Copyright 2001, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
-#ifndef KERNEL_ARCH_PPC_THREAD_STRUCT_H
-#define KERNEL_ARCH_PPC_THREAD_STRUCT_H
+#ifndef KERNEL_ARCH_PPC_THREAD_TYPES_H
+#define KERNEL_ARCH_PPC_THREAD_TYPES_H
 
 // architecture specific thread info
 struct arch_thread {
@@ -18,4 +18,4 @@ struct arch_fork_arg {
 	// nothing here yet
 };
 
-#endif	/* KERNEL_ARCH_PPC_THREAD_STRUCT_H */
+#endif	/* KERNEL_ARCH_PPC_THREAD_TYPES_H */
diff --git a/headers/private/kernel/arch/thread_struct.h b/headers/private/kernel/arch/thread_struct.h
deleted file mode 100644
index 783af66278..0000000000
--- a/headers/private/kernel/arch/thread_struct.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 
-** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
-#ifndef KERNEL_ARCH_THREAD_STRUCT_H
-#define KERNEL_ARCH_THREAD_STRUCT_H
-
-#ifdef ARCH_x86
-#include <arch/x86/thread_struct.h>
-#endif
-#ifdef ARCH_sh4
-#include <arch/sh4/thread_struct.h>
-#endif
-#ifdef ARCH_alpha
-#include <arch/alpha/thread_struct.h>
-#endif
-#ifdef ARCH_sparc64
-#include <arch/sparc64/thread_struct.h>
-#endif
-#ifdef ARCH_mips
-#include <arch/mips/thread_struct.h>
-#endif
-#ifdef ARCH_ppc
-#include <arch/ppc/thread_struct.h>
-#endif
-#ifdef ARCH_m68k
-#include <arch/m68k/thread_struct.h>
-#endif
-
-#endif	/* KERNEL_ARCH_THREAD_STRUCT_H */
diff --git a/headers/private/kernel/arch/thread_types.h b/headers/private/kernel/arch/thread_types.h
new file mode 100644
index 0000000000..b8b37e106a
--- /dev/null
+++ b/headers/private/kernel/arch/thread_types.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2005, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef KERNEL_ARCH_THREAD_TYPES_H
+#define KERNEL_ARCH_THREAD_TYPES_H
+
+#include <arch_thread_types.h>
+
+#endif	/* KERNEL_ARCH_THREAD_TYPES_H */
diff --git a/headers/private/kernel/arch/x86/thread_struct.h b/headers/private/kernel/arch/x86/arch_thread_types.h
similarity index 88%
rename from headers/private/kernel/arch/x86/thread_struct.h
rename to headers/private/kernel/arch/x86/arch_thread_types.h
index 29fb9c262a..3bd0042784 100644
--- a/headers/private/kernel/arch/x86/thread_struct.h
+++ b/headers/private/kernel/arch/x86/arch_thread_types.h
@@ -5,8 +5,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_ARCH_x86_THREAD_STRUCT_H
-#define _KERNEL_ARCH_x86_THREAD_STRUCT_H
+#ifndef _KERNEL_ARCH_x86_THREAD_TYPES_H
+#define _KERNEL_ARCH_x86_THREAD_TYPES_H
 
 
 #include <arch_cpu.h>
@@ -47,4 +47,4 @@ struct arch_fork_arg {
 	struct iframe	iframe;
 };
 
-#endif	/* _KERNEL_ARCH_x86_THREAD_STRUCT_H */
+#endif	/* _KERNEL_ARCH_x86_THREAD_TYPES_H */
diff --git a/headers/private/kernel/thread_types.h b/headers/private/kernel/thread_types.h
index 3b62d84474..fc7bb07104 100644
--- a/headers/private/kernel/thread_types.h
+++ b/headers/private/kernel/thread_types.h
@@ -14,7 +14,7 @@
 #include <timer.h>
 #include <user_debugger.h>
 #include <util/list.h>
-#include <arch/thread_struct.h>
+#include <arch/thread_types.h>
 
 
 extern spinlock thread_spinlock;