about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-09-25 10:04:15 +0000
committerRoland McGrath <roland@gnu.org>2004-09-25 10:04:15 +0000
commit3ba0767c784cec5e3d4249263a4a5c30b8f7e80d (patch)
treece19528aad81f56f9cd1cb261c44140ea36ecb7e /linuxthreads
parent5f66b766e7b1929b07ab3e0374a9a627a45c9be6 (diff)
downloadglibc-3ba0767c784cec5e3d4249263a4a5c30b8f7e80d.tar.gz
glibc-3ba0767c784cec5e3d4249263a4a5c30b8f7e80d.tar.xz
glibc-3ba0767c784cec5e3d4249263a4a5c30b8f7e80d.zip
[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.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/sysdeps/i386/i686/pt-machine.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h
index 1c75bf9807..7b4ff92383 100644
--- 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