--- src/lib/libthread_xu/thread/thr_cancel.c	2005/02/01 12:38:27	1.1
+++ src/lib/libthread_xu/thread/thr_cancel.c	2005/03/29 19:26:20	1.2
@@ -26,6 +26,8 @@
  * $DragonFly$
  */
 
+#include <machine/tls.h>
+
 #include <pthread.h>
 #include "thr_private.h"
 
@@ -39,7 +41,7 @@ int _pthread_setcanceltype(int type, int
 int
 _pthread_cancel(pthread_t pthread)
 {
-	struct pthread *curthread = _get_curthread();
+	struct pthread *curthread = tls_get_curthread();
 	int oldval, newval = 0;
 	int oldtype;
 	int ret;
@@ -82,7 +84,7 @@ testcancel(struct pthread *curthread)
 int
 _pthread_setcancelstate(int state, int *oldstate)
 {
-	struct pthread *curthread = _get_curthread();
+	struct pthread *curthread = tls_get_curthread();
 	int oldval, ret;
 
 	oldval = curthread->cancelflags;
@@ -109,7 +111,7 @@ _pthread_setcancelstate(int state, int *
 int
 _pthread_setcanceltype(int type, int *oldtype)
 {
-	struct pthread	*curthread = _get_curthread();
+	struct pthread	*curthread = tls_get_curthread();
 	int oldval, ret;
 
 	oldval = curthread->cancelflags;
@@ -137,7 +139,7 @@ _pthread_setcanceltype(int type, int *ol
 void
 _pthread_testcancel(void)
 {
-	testcancel(_get_curthread());
+	testcancel(tls_get_curthread());
 }
 
 int