mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 08:11:08 +00:00
[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.
This commit is contained in:
parent
5f66b766e7
commit
3ba0767c78
@ -1,6 +1,6 @@
|
|||||||
/* Machine-dependent pthreads configuration and inline functions.
|
/* Machine-dependent pthreads configuration and inline functions.
|
||||||
i686 version.
|
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.
|
This file is part of the GNU C Library.
|
||||||
Contributed by Richard Henderson <rth@tamu.edu>.
|
Contributed by Richard Henderson <rth@tamu.edu>.
|
||||||
|
|
||||||
@ -69,7 +69,9 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
|
|||||||
}
|
}
|
||||||
#endif
|
#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"
|
#include "../useldt.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user