From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 07:26:49 +0000 (+0900)
Subject: tree-wide: use  instead of #ifdef for HAVE_*
X-Git-Tag: v240~1014
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=545cdb90f376c68777fda58d1e718b355d2280fd;p=platform%2Fupstream%2Fsystemd.git

tree-wide: use  instead of #ifdef for HAVE_*
---

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index a98e53b..825b67e 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -4,7 +4,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
-#ifdef HAVE_CRYPT_H
+#if HAVE_CRYPT_H
 /* libxcrypt is a replacement for glibc's libcrypt, and libcrypt might be
  * removed from glibc at some point. As part of the removal, defines for
  * crypt(3) are dropped from unistd.h, and we must include crypt.h instead.
diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index aa4bd74..293a0fa 100644
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -11,7 +11,7 @@ const char* const dnssd_service_dirs[] = {
         "/etc/systemd/dnssd",
         "/run/systemd/dnssd",
         "/usr/lib/systemd/dnssd",
-#ifdef HAVE_SPLIT_USR
+#if HAVE_SPLIT_USR
         "/lib/systemd/dnssd",
 #endif
     NULL
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 927de35..7489bf1 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1052,7 +1052,7 @@ static int fd_set_acls(Item *item, int fd, const struct stat *st) {
 
 static int path_set_acls(Item *item, const char *path) {
         int r = 0;
-#ifdef HAVE_ACL
+#if HAVE_ACL
         _cleanup_close_ int fd = -1;
         struct stat st;
 
@@ -1067,9 +1067,9 @@ static int path_set_acls(Item *item, const char *path) {
                 return log_error_errno(errno, "Failed to fstat() file %s: %m", path);
 
         r = fd_set_acls(item, fd, &st);
- #endif
-         return r;
- }
+#endif
+        return r;
+}
 
 #define ATTRIBUTES_ALL                          \
         (FS_NOATIME_FL      |                   \