diff options
Diffstat (limited to 'nptl/sysdeps')
-rw-r--r-- | nptl/sysdeps/pthread/list.h | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/allocrtsig.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nptl/sysdeps/pthread/list.h b/nptl/sysdeps/pthread/list.h index 1d6a4cfa65..43186a2d51 100644 --- a/nptl/sysdeps/pthread/list.h +++ b/nptl/sysdeps/pthread/list.h @@ -20,8 +20,6 @@ #ifndef _LIST_H #define _LIST_H 1 -#include <assert.h> - /* The definitions of this file are adopted from those which can be found in the Linux kernel headers to enable people familiar with the latter find their way in these sources as well. */ diff --git a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c index 5badaea9ec..e3622c6076 100644 --- a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c +++ b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c @@ -31,6 +31,7 @@ __libc_current_sigrtmin (void) { return current_rtmin; } +libc_hidden_def (__libc_current_sigrtmin) strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private) @@ -39,6 +40,7 @@ __libc_current_sigrtmax (void) { return current_rtmax; } +libc_hidden_def (__libc_current_sigrtmax) strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private) diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 9a3cb04d73..d9b51a4da5 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> #include <tls.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <nptl/pthreadP.h> #endif @@ -76,7 +76,7 @@ # define POPCARGS_4 POPCARGS_2 # define POPCARGS_5 POPCARGS_2 -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ header.data.multiple_threads) == 0, 1) @@ -84,7 +84,7 @@ # define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) |