From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 4 Jan 2020 17:52:00 +0000 (+0100)
Subject: htl: Drop common tcbhead_t definition
X-Git-Tag: glibc-2.31~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12e166dd80bd3056f667930719572017d25a79c4;p=thirdparty%2Fglibc.git

htl: Drop common tcbhead_t definition

This would conflict when including pt-internal.h outside libpthread, while
we can actually just include <tls.h>
---

diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index ebe7f43d887..8754f386a62 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -37,6 +37,8 @@
 # include <ldsodefs.h>
 #endif
 
+#include <tls.h>
+
 /* Thread state.  */
 enum pthread_state
 {
@@ -58,16 +60,6 @@ enum pthread_state
 # define PTHREAD_SYSDEP_MEMBERS
 #endif
 
-#if !(IS_IN (libpthread))
-/* Type of the TCB.  */
-typedef struct
-{
-  void *tcb;			/* Points to this structure.  */
-  void *dtv;			/* Vector of pointers to TLS data.  */
-  thread_t self;		/* This thread's control port.  */
-} tcbhead_t;
-#endif /* ! IS_IN (libpthread) */
-
 /* This structure describes a POSIX thread.  */
 struct __pthread
 {