From 40bfa3f782467278bc14623d98845f491df2af2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sat, 27 Nov 2004 12:52:29 +0000
Subject: [PATCH] The inline version of find_thread() now references
 _kern_find_thread() if __HAIKU__ is defined.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10266 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/kernel/OS.h | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index e631c75556..ffe5e8af60 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -1,7 +1,8 @@
 /* Kernel specific structures and functions
-**
-** Distributed under the terms of the Haiku License.
-*/
+ *
+ * Copyright 2004, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _OS_H
 #define _OS_H
 
@@ -213,8 +214,13 @@ typedef struct {
 	bigtime_t		kernel_time;
 } team_usage_info;
 
+enum {
+	B_TEAM_USAGE_SELF		= 0,
+	B_TEAM_USAGE_CHILDREN	= -1,
+};
+
 /* system private, use macros instead */
-extern status_t	_get_team_usage_info(team_id team, int32 who, team_usage_info *tui, size_t size);
+extern status_t	_get_team_usage_info(team_id team, int32 who, team_usage_info *info, size_t size);
 
 #define get_team_usage_info(team, who, info) \
 			_get_team_usage_info((team), (who), (info), sizeof(*(info)))
@@ -277,15 +283,22 @@ extern status_t		on_exit_thread(void (*callback)(void *), void *data);
 #if __INTEL__ && !_KERNEL_MODE && !_NO_INLINE_ASM
 static inline thread_id
 find_thread(const char *name) {
-	extern thread_id _kfind_thread_(const char *name);
+#	ifndef __HAIKU__
+/* ToDo: this can be removed once we don't need BeOS compatibility of our source files */
+#		define _kern_find_thread _kfind_thread_
+#	endif
+	extern thread_id _kern_find_thread(const char *name);
 	if (!name) {
 		thread_id thread;
 		__asm__ __volatile__ ( 
 			"movl	%%fs:4, %%eax \n\t"
-			: "=a"(thread) );
+			: "=a" (thread));
 		return thread;
 	}
-	return _kfind_thread_(name);
+	return _kern_find_thread(name);
+#	ifndef __HAIKU
+#		undef _kern_find_thread
+#	endif
 }
 #else
 extern thread_id 	find_thread(const char *name);