This would conflict when including pt-internal.h outside libpthread, while we can actually just include <tls.h> --- htl/pt-internal.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/htl/pt-internal.h b/htl/pt-internal.h index ebe7f43d88..8754f386a6 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 { -- 2.24.1