diff options
| author | Rafael Avila de Espindola <rafael@espindo.la> | 2018-10-31 10:31:06 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-10-31 10:32:40 -0700 |
| commit | 9c3dbdbe29837a6cdb30eae5b2fea21e0447e77a (patch) | |
| tree | d7049eb5e9a3f8229fdf7298fdc767eee85287d8 | |
| parent | 9c0a35d162fcce1e6d27e1e7327e4cef7d8a8e9d (diff) | |
| download | glibc-9c3dbdbe29837a6cdb30eae5b2fea21e0447e77a.tar.gz glibc-9c3dbdbe29837a6cdb30eae5b2fea21e0447e77a.tar.xz glibc-9c3dbdbe29837a6cdb30eae5b2fea21e0447e77a.zip | |
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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysdep-vdso.h | 29 |
2 files changed, 15 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index b798b63f79..0a0788910e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/sysdeps/unix/sysv/linux/sysdep-vdso.h b/sysdeps/unix/sysv/linux/sysdep-vdso.h index 1912c1c156..7f894c5e02 100644 --- a/sysdeps/unix/sysv/linux/sysdep-vdso.h +++ b/sysdeps/unix/sysv/linux/sysdep-vdso.h @@ -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 /* SHARED */ +#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) +# 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 */ |