[BZ #406]

2004-09-25  Roland McGrath  <roland@redhat.com>
	[BZ #406]
	* sysdeps/i386/i686/pt-machine.h: Don't #include "../useldt.h" if
	[_TLS_H], since sysdeps/i386/tls.h includes it after including us.

diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h
index 1c75bf9..7b4ff92 100644 (file)
--- a/linuxthreads/sysdeps/i386/i686/pt-machine.h
+++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h
@@ -1,6 +1,6 @@
 /* Machine-dependent pthreads configuration and inline functions.
    i686 version.
-   Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <rth@tamu.edu>.
 
@@ -69,7 +69,9 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
 }
 #endif
 
-#if __ASSUME_LDT_WORKS > 0
+/* If tls.h was included, it will include useldt.h after defining USE_TLS.
+   We don't want to include it here first when tls.h includes us.  */
+#if __ASSUME_LDT_WORKS > 0 && !defined _TLS_H
 #include "../useldt.h"
 #endif