6 files changed, 22 insertions, 11 deletions
diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog
index ed6a689..ec19176 100644
--- a/libpthread/ChangeLog
+++ b/libpthread/ChangeLog
@@ -1,5 +1,20 @@
 2008-12-17  Neal H. Walfield  <neal@gnu.org>
 
+	* sysdeps/viengoos/ia32/pt-setup.c: Don't include
+	<hurd/exceptions.h> or <viengoos/thread.h>.
+	* sysdeps/viengoos/pt-startup.c (__pthread_startup): Don't include
+	<l4.h> or <hurd/exceptions.h>.  Include <hurd/thread.h>.
+	(__pthread_startup): Set pthread->threadid using hurd_myself.
+	* sysdeps/viengoos/pt-sysdep.h: Don't cinlude
+	<hurd/exceptions.h>.  Include <hurd/thread.h>.
+	* sysdeps/viengoos/pt-thread-dealloc.c: Don't include
+	<hurd/exceptions.h>.  Include <hurd/thread.h>.
+	* sysdeps/viengoos/pt-thread-start.c: Don't include
+	<viengoos/thread.h> or <hurd/exceptions.h>.  Include
+	<hurd/thread.h>.
+
+2008-12-17  Neal H. Walfield  <neal@gnu.org>
+
 	* sysdeps/generic/bits/spin-lock.h: New file.
 
 2008-12-17  Neal H. Walfield  <neal@gnu.org>
diff --git a/libpthread/sysdeps/viengoos/ia32/pt-setup.c b/libpthread/sysdeps/viengoos/ia32/pt-setup.c
index bdd814a..5604d11 100644
--- a/libpthread/sysdeps/viengoos/ia32/pt-setup.c
+++ b/libpthread/sysdeps/viengoos/ia32/pt-setup.c
@@ -20,8 +20,6 @@
 #include <l4.h>
 
 #include <pt-internal.h>
-#include <viengoos/thread.h>
-#include <hurd/exceptions.h>
 
 /* The stack layout used on the i386 is:
 
diff --git a/libpthread/sysdeps/viengoos/pt-startup.c b/libpthread/sysdeps/viengoos/pt-startup.c
index b6461de..1a93e2e 100644
--- a/libpthread/sysdeps/viengoos/pt-startup.c
+++ b/libpthread/sysdeps/viengoos/pt-startup.c
@@ -1,5 +1,5 @@
-/* Thread initialization.  Hurd/L4 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+/* Thread initialization.  Viengoos version.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,14 +17,13 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <l4.h>
 #include <pt-internal.h>
 
-#include <hurd/exceptions.h>
+#include <hurd/thread.h>
 
 void
 __pthread_startup (void)
 {
   struct __pthread *pthread = _pthread_self ();
-  pthread->threadid = l4_myself ();
+  pthread->threadid = hurd_myself ();
 }
diff --git a/libpthread/sysdeps/viengoos/pt-sysdep.h b/libpthread/sysdeps/viengoos/pt-sysdep.h
index b276b87..f7ababa 100644
--- a/libpthread/sysdeps/viengoos/pt-sysdep.h
+++ b/libpthread/sysdeps/viengoos/pt-sysdep.h
@@ -30,7 +30,7 @@
 /* The default stack size: 2MB.  */
 #define PTHREAD_STACK_DEFAULT	(2 * 1024 * 1024)
 
-#include <hurd/exceptions.h>
+#include <hurd/thread.h>
 #include <hurd/message-buffer.h>
 
 #define PTHREAD_SYSDEP_MEMBERS					\
diff --git a/libpthread/sysdeps/viengoos/pt-thread-dealloc.c b/libpthread/sysdeps/viengoos/pt-thread-dealloc.c
index f7d732b..2011df2 100644
--- a/libpthread/sysdeps/viengoos/pt-thread-dealloc.c
+++ b/libpthread/sysdeps/viengoos/pt-thread-dealloc.c
@@ -22,7 +22,7 @@
 
 #include <pt-internal.h>
 
-#include <hurd/exceptions.h>
+#include <hurd/thread.h>
 #include <hurd/mutex.h>
 #include <hurd/as.h>
 #include <viengoos/addr.h>
diff --git a/libpthread/sysdeps/viengoos/pt-thread-start.c b/libpthread/sysdeps/viengoos/pt-thread-start.c
index 6a9fc90..1b341cb 100644
--- a/libpthread/sysdeps/viengoos/pt-thread-start.c
+++ b/libpthread/sysdeps/viengoos/pt-thread-start.c
@@ -20,8 +20,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <viengoos/thread.h>
-#include <hurd/exceptions.h>
+#include <hurd/thread.h>
 
 #include <pt-internal.h>