--- src/lib/libthread_xu/arch/amd64/amd64/pthread_md.c	2005/03/28 03:33:13	1.2
+++ src/lib/libthread_xu/arch/amd64/amd64/pthread_md.c	2005/03/29 19:26:20	1.3
@@ -35,11 +35,10 @@
 /*
  * The constructors.
  */
-struct tcb *
+struct tls_tcb *
 _tcb_ctor(struct pthread *thread, int initial)
 {
-	struct tcb *old_tcb;
-	struct tcb *tcb;
+	struct tls_tcb *old_tcb, *tcb;
 	int flags;
 
 	old_tcb = NULL;
@@ -57,15 +56,14 @@ _tcb_ctor(struct pthread *thread, int in
 		}
 	}
 	tcb = _rtld_allocate_tls(old_tcb, sizeof(struct tcb), flags);
-	if (tcb) {
-		tcb->tcb_thread = thread;
-	}
+	if (tcb)
+		tcb->tcb_pthread = thread;
 
 	return (tcb);
 }
 
 void
-_tcb_dtor(struct tcb *tcb)
+_tcb_dtor(struct tls_tcb *tcb)
 {
-	_rtld_free_tls(tcb, sizeof(struct tcb), 16);
+	_rtld_free_tls(tcb, sizeof(struct tcb));
 }