From owner-p4-projects@FreeBSD.ORG  Wed Jan  5 13:42:26 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 253BE16A4D0; Wed,  5 Jan 2005 13:42:26 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 018B816A4CE
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 13:42:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B7F0343D2D
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 13:42:25 +0000 (GMT)
	(envelope-from davidxu@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05DgPIs012047
	for <perforce@freebsd.org>; Wed, 5 Jan 2005 13:42:25 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05DgPtP012044
	for perforce@freebsd.org; Wed, 5 Jan 2005 13:42:25 GMT
	(envelope-from davidxu@freebsd.org)
Date: Wed, 5 Jan 2005 13:42:25 GMT
Message-Id: <200501051342.j05DgPtP012044@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68316 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jan 2005 13:42:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=68316

Change 68316 by davidxu@davidxu_tiger on 2005/01/05 13:42:24

	Fix pthread.h inclusion, don't include it twice for most files.

Affected files ...

.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#12 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#2 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#3 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#14 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#4 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#6 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#6 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#3 edit

Differences ...

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#12 (text+ko) ====

@@ -30,6 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <pthread.h>
 #include "thr_private.h"
 
 /*#define DEBUG_THREAD_KERN */

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#2 (text+ko) ====

@@ -35,6 +35,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 
 #include "thr_private.h"
 #include "libc_private.h"

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#3 (text+ko) ====

@@ -30,6 +30,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
+#include <pthread.h>
 
 #include "thr_private.h"
 

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#14 (text+ko) ====

@@ -54,8 +54,6 @@
 #include <ucontext.h>
 #include <sys/thr.h>
 #include <sys/umtx.h>
-#include <pthread.h>
-#include <pthread_np.h>
 
 #include "pthread_md.h"
 

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#4 (text+ko) ====

@@ -29,6 +29,7 @@
  */
 #include <sys/cdefs.h>
 #include <stdlib.h>
+#include <pthread.h>
 
 #include "rtld_lock.h"
 #include "thr_private.h"

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#6 (text+ko) ====

@@ -39,7 +39,6 @@
 #include <time.h>
 #include <_semaphore.h>
 #include "un-namespace.h"
-#include "libc_private.h"
 #include "thr_private.h"
 
 

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#6 (text+ko) ====

@@ -35,7 +35,7 @@
 
 #include <sys/types.h>
 #include <machine/atomic.h>
-
+#include <pthread.h>
 #include <libc_private.h>
 #include "spinlock.h"
 #include "thr_private.h"

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#3 (text+ko) ====

@@ -54,10 +54,6 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-
-#include "namespace.h"
-#include "un-namespace.h"
-
 #include <pthread.h>
 
 #include "thr_private.h"