diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /hurd/hurd/userlink.h | |
parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'hurd/hurd/userlink.h')
-rw-r--r-- | hurd/hurd/userlink.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h index 128ce59726..f9362557cb 100644 --- a/hurd/hurd/userlink.h +++ b/hurd/hurd/userlink.h @@ -1,5 +1,5 @@ /* Support for chains recording users of a resource; `struct hurd_userlink'. - Copyright (C) 1994-2016 Free Software Foundation, Inc. + Copyright (C) 1994-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,7 +24,11 @@ #define __need_NULL #include <stddef.h> -#include <hurd/signal.h> +#if defined __USE_EXTERN_INLINES && defined _LIBC +# if IS_IN (libc) +# include <hurd/signal.h> +# endif +#endif #include <setjmp.h> @@ -81,7 +85,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE void _hurd_userlink_link (struct hurd_userlink **chainp, struct hurd_userlink *link) @@ -102,7 +106,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, link->thread.prevp = thread_chainp; *thread_chainp = link; } -# endif +# endif #endif @@ -112,7 +116,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, extern int _hurd_userlink_unlink (struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE int _hurd_userlink_unlink (struct hurd_userlink *link) { @@ -135,7 +139,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link) return dealloc; } -# endif +# endif #endif @@ -148,7 +152,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link) extern int _hurd_userlink_clear (struct hurd_userlink **chainp); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE int _hurd_userlink_clear (struct hurd_userlink **chainp) { @@ -161,7 +165,7 @@ _hurd_userlink_clear (struct hurd_userlink **chainp) *chainp = NULL; return 0; } -# endif +# endif #endif #endif /* hurd/userlink.h */ |