From: Stepan Kasal <skasal@redhat.com>
Date: Tue, 15 May 2007 18:46:13 +0000 (+0200)
Subject: swapon: simplify an #if
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67c4ade809dc8859dbe9f3511b8968d153ac6b6f;p=util-linux

swapon: simplify an #if

Replace two immerced #ifdef's by an #if with a compound conditional.

Signed-off-by: Stepan Kasal <skasal@redhat.com>
---

diff --git a/mount/swapon.c b/mount/swapon.c
index b6bcd750..7337e32c 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -75,11 +75,7 @@ swapoff_usage(FILE *fp, int n) {
 #define SWAPON_NEEDS_TWO_ARGS
 #endif
 
-#ifdef SWAPON_NEEDS_TWO_ARGS
-#ifdef SWAPON_HAS_TWO_ARGS
-/* libc is OK */
-#include <unistd.h>
-#else
+#if defined(SWAPON_NEEDS_TWO_ARGS) && !defined(SWAPON_HAS_TWO_ARGS)
 /* We want a swapon with two args, but have an old libc.
    Build the kernel call by hand. */
 #include <linux/unistd.h>
@@ -87,7 +83,6 @@ static
 _syscall2(int,  swapon,  const char *,  path, int, flags);
 static
 _syscall1(int,  swapoff,  const char *,  path);
-#endif
 #else
 /* just do as libc says */
 #include <unistd.h>