diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-10-25 00:46:50 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-10-25 00:46:50 +0200 |
| commit | 5df5f8f8a04a278d653f7bac8199fafdd2f01cbf (patch) | |
| tree | a4cfcbfcbe5937e9cda8ac5464c0e08340d7e111 /hurd/hurd/signal.h | |
| parent | 59ff42dc062f858c9e143a41baef62ee05d3b360 (diff) | |
| parent | b3320e243e29a0451fb5aa6d39c6bfe2200504dc (diff) | |
Merge branch 't/tls-threadvar' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
hurd/hurd/signal.h
sysdeps/mach/hurd/i386/init-first.c
Diffstat (limited to 'hurd/hurd/signal.h')
| -rw-r--r-- | hurd/hurd/signal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index cc0f795f88..d5af397da9 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -40,7 +40,6 @@ #include <cthreads.h> /* For `struct mutex'. */ #include <setjmp.h> /* For `jmp_buf'. */ #include <spin-lock.h> -#include <hurd/threadvar.h> /* We cache sigstate in a threadvar. */ struct hurd_signal_preemptor; /* <hurd/sigpreempt.h> */ @@ -155,7 +154,8 @@ extern void _hurd_sigstate_delete (thread_t thread); #define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline #endif -#ifdef __USE_EXTERN_INLINES +extern __thread struct hurd_sigstate *_hurd_sigstate; +#if defined __USE_EXTERN_INLINES && defined _LIBC _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * _hurd_self_sigstate (void) { @@ -186,7 +186,7 @@ extern int _hurd_core_limit; void *_hurd_critical_section_lock (void); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _HURD_SIGNAL_H_EXTERN_INLINE void * _hurd_critical_section_lock (void) { @@ -222,7 +222,7 @@ _hurd_critical_section_lock (void) void _hurd_critical_section_unlock (void *our_lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _HURD_SIGNAL_H_EXTERN_INLINE void _hurd_critical_section_unlock (void *our_lock) { |