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>

diff --git a/ChangeLog b/ChangeLog
index b798b63f79176f70b934396e48e226f3059a1e68..0a0788910ed2bbbaae352dea42eef72c28c5d233 100644 (file)
--- 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 1912c1c156866105bc84dcdad685dfbe451670ec..7f894c5e02c093bace9b3e490ebfeb393833d58d 100644 (file)
--- 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  */