diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-11-14 00:55:55 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-11-14 00:55:55 +0100 |
| commit | 8dc032221d71a74de09a2e8bc76fa8ea38e33c9a (patch) | |
| tree | 11b963d861770cd814470f102179a6ddcc4ade1a /sysdeps | |
| parent | 2a501c9e3671201cc0d0f2469118459d70b887ba (diff) | |
| parent | 92b65711bb665e24490879cbaa71b5f0443847ba (diff) | |
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/machine-lock.h | 6 | ||||
| -rw-r--r-- | sysdeps/generic/machine-sp.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/i386/machine-lock.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sysdeps/generic/machine-lock.h b/sysdeps/generic/machine-lock.h index 71e299eb5e..883b63bd48 100644 --- a/sysdeps/generic/machine-lock.h +++ b/sysdeps/generic/machine-lock.h @@ -36,7 +36,7 @@ typedef volatile int __spin_lock_t; void __spin_unlock (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE void __spin_unlock (__spin_lock_t *__lock) { @@ -48,7 +48,7 @@ __spin_unlock (__spin_lock_t *__lock) int __spin_try_lock (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE int __spin_try_lock (__spin_lock_t *__lock) { @@ -63,7 +63,7 @@ __spin_try_lock (__spin_lock_t *__lock) int __spin_lock_locked (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE int __spin_lock_locked (__spin_lock_t *__lock) { diff --git a/sysdeps/generic/machine-sp.h b/sysdeps/generic/machine-sp.h index 0bc90f3d5b..f9beec4da5 100644 --- a/sysdeps/generic/machine-sp.h +++ b/sysdeps/generic/machine-sp.h @@ -27,7 +27,7 @@ void * __thread_stack_pointer (void); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE void * __thread_stack_pointer (void) { diff --git a/sysdeps/mach/i386/machine-lock.h b/sysdeps/mach/i386/machine-lock.h index 4b3a6f1ab0..12f06b5cb2 100644 --- a/sysdeps/mach/i386/machine-lock.h +++ b/sysdeps/mach/i386/machine-lock.h @@ -36,7 +36,7 @@ typedef volatile int __spin_lock_t; void __spin_unlock (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE void __spin_unlock (__spin_lock_t *__lock) { @@ -51,7 +51,7 @@ __spin_unlock (__spin_lock_t *__lock) int __spin_try_lock (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE int __spin_try_lock (__spin_lock_t *__lock) { @@ -67,7 +67,7 @@ __spin_try_lock (__spin_lock_t *__lock) int __spin_lock_locked (__spin_lock_t *__lock); -#ifdef __USE_EXTERN_INLINES +#if defined __USE_EXTERN_INLINES && defined _LIBC _EXTERN_INLINE int __spin_lock_locked (__spin_lock_t *__lock) { |