mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
Simplify an #if #else #endif
The #else of two nested #if clauses were identical. * sysdeps/unix/sysv/linux/sysdep-vdso.h: Simplify an #if #else #endif. Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
This commit is contained in:
parent
9c0a35d162
commit
9c3dbdbe29
@ -1,3 +1,8 @@
|
||||
2018-10-31 Rafael Avila de Espindola <rafael@espindo.la>
|
||||
|
||||
* sysdeps/unix/sysv/linux/sysdep-vdso.h: Simplify an #if #else
|
||||
#endif.
|
||||
|
||||
2018-10-31 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
|
||||
* manual/errno.texi (EIEIO): Document how translators should
|
||||
|
@ -26,13 +26,11 @@
|
||||
funcptr (args)
|
||||
#endif
|
||||
|
||||
#ifdef SHARED
|
||||
#if defined SHARED && defined HAVE_VSYSCALL
|
||||
|
||||
# ifdef HAVE_VSYSCALL
|
||||
# include <libc-vdso.h>
|
||||
|
||||
# include <libc-vdso.h>
|
||||
|
||||
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||
({ \
|
||||
__label__ out; \
|
||||
__label__ iserr; \
|
||||
@ -61,7 +59,7 @@
|
||||
sc_ret; \
|
||||
})
|
||||
|
||||
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||
({ \
|
||||
__label__ out; \
|
||||
long v_ret; \
|
||||
@ -79,20 +77,13 @@
|
||||
out: \
|
||||
v_ret; \
|
||||
})
|
||||
# else
|
||||
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||
INLINE_SYSCALL (name, nr, ##args)
|
||||
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||
INTERNAL_SYSCALL (name, err, nr, ##args)
|
||||
# endif /* HAVE_VSYSCALL */
|
||||
#else
|
||||
|
||||
# else /* SHARED */
|
||||
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||
INLINE_SYSCALL (name, nr, ##args)
|
||||
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||
INTERNAL_SYSCALL (name, err, nr, ##args)
|
||||
|
||||
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||
INLINE_SYSCALL (name, nr, ##args)
|
||||
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||
INTERNAL_SYSCALL (name, err, nr, ##args)
|
||||
|
||||
#endif /* SHARED */
|
||||
#endif /* defined SHARED && defined HAVE_VSYSCALL */
|
||||
|
||||
#endif /* SYSDEP_VDSO_LINUX_H */
|
||||
|
Loading…
Reference in New Issue
Block a user