From d21d530170abcaec33ba272b11cb6615eb2804de Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 21 Apr 2012 22:54:16 +0000
Subject: Do not redefine tcbhead_t in glibc

* pthread/pt-internal.h (tcbhead_t): Define struct only if IS_IN_libpthread
is not defined.
---
 pthread/pt-internal.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pthread')

diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h
index 94bc9a7..6186c86 100644
--- a/pthread/pt-internal.h
+++ b/pthread/pt-internal.h
@@ -54,6 +54,7 @@ enum pthread_state
 # define PTHREAD_SYSDEP_MEMBERS
 #endif
 
+#ifndef IS_IN_libpthread
 #ifdef ENABLE_TLS
 /* Type of the TCB.  */
 typedef struct
@@ -63,6 +64,7 @@ typedef struct
   thread_t self;		/* This thread's control port.  */
 } tcbhead_t;
 #endif /* ENABLE_TLS */
+#endif /* IS_IN_libpthread */
 
 /* This structure describes a POSIX thread.  */
 struct __pthread
-- 
cgit v1.2.3