diff options
Diffstat (limited to 'linuxthreads/sysdeps/i386')
| -rw-r--r-- | linuxthreads/sysdeps/i386/i686/pt-machine.h | 4 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/tls.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index 7b4ff92383..6048bc448f 100644 --- a/linuxthreads/sysdeps/i386/i686/pt-machine.h +++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h @@ -69,9 +69,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval) } #endif -/* 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 +#if __ASSUME_LDT_WORKS > 0 #include "../useldt.h" #endif diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 30a6e59963..c1f47ca864 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -120,7 +120,9 @@ typedef struct # define TLS_LOAD_EBX # endif -# include "useldt.h" /* For the structure. */ +# ifndef THREAD_SELF +# include "useldt.h" /* For the structure. */ +# endif # if __ASSUME_LDT_WORKS > 0 # define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check. */ # else |