qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Rafael Avila de Espindola 2018-10-31 10:31:06 -07:00 committed by H.J. Lu
parent 9c0a35d162
commit 9c3dbdbe29
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2018-10-31 Samuel Thibault <samuel.thibault@ens-lyon.org>
* manual/errno.texi (EIEIO): Document how translators should * manual/errno.texi (EIEIO): Document how translators should

29
sysdeps/unix/sysv/linux/sysdep-vdso.h
View File

@ -26,13 +26,11 @@
funcptr (args) funcptr (args)
#endif #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__ out; \
__label__ iserr; \ __label__ iserr; \
@ -61,7 +59,7 @@
sc_ret; \ sc_ret; \
}) })
# define INTERNAL_VSYSCALL(name, err, nr, args...) \ # define INTERNAL_VSYSCALL(name, err, nr, args...) \
({ \ ({ \
__label__ out; \ __label__ out; \
long v_ret; \ long v_ret; \
@ -79,20 +77,13 @@
out: \ out: \
v_ret; \ v_ret; \
}) })
# else #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 */ # 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...) \ #endif /* defined SHARED && defined HAVE_VSYSCALL */
INLINE_SYSCALL (name, nr, ##args)
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL (name, err, nr, ##args)
#endif /* SHARED */
#endif /* SYSDEP_VDSO_LINUX_H */ #endif /* SYSDEP_VDSO_LINUX_H */