tree-wide: fix some ifdef checks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/cgroups/cgroup_utils.c b/src/cgroups/cgroup_utils.c
index 82e5250c40f88abc950d85e9fa8fa518985fe6e9..f4ae4ccf93849c5cb2a3f72010be9be682b10aad 100644 (file)
--- a/src/cgroups/cgroup_utils.c
+++ b/src/cgroups/cgroup_utils.c
@@ -431,7 +431,7 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
        return 0;
 }
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
        size_t ret = strlen(src);
@@ -446,7 +446,7 @@ size_t strlcpy(char *dest, const char *src, size_t size)
 }
 #endif
 
-#ifndef HAVE_STRLCAT
+#if !HAVE_STRLCAT
 size_t strlcat(char *d, const char *s, size_t n)
 {
        size_t l = strnlen(d, n);

diff --git a/src/cgroups/cgroup_utils.h b/src/cgroups/cgroup_utils.h
index d1f563934bb20df7297e8573b4b9597f5d2c06b0..8576e5e4ec54be506871087a23f8356a6b469007 100644 (file)
--- a/src/cgroups/cgroup_utils.h
+++ b/src/cgroups/cgroup_utils.h
@@ -70,11 +70,11 @@ extern bool dir_exists(const char *path);
 extern int safe_mount(const char *src, const char *dest, const char *fstype,
                      unsigned long flags, const void *data, const char *rootfs);
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 extern size_t strlcpy(char *, const char *, size_t);
 #endif
 
-#ifndef HAVE_STRLCAT
+#if !HAVE_STRLCAT
 extern size_t strlcat(char *d, const char *s, size_t n);
 #endif
 

diff --git a/src/proc_fuse.c b/src/proc_fuse.c
index e47d5fb6999d390e3174d1cb4508399182cd2f65..8208a3222cfdc2c11f06ff65d6a45e252bec6874 100644 (file)
--- a/src/proc_fuse.c
+++ b/src/proc_fuse.c
@@ -648,7 +648,7 @@ static int proc_diskstats_read(char *buf, size_t size, off_t offset,
        return total_len;
 }
 
-#if RELOADTEST
+#ifdef RELOADTEST
 static inline void iwashere(void)
 {
        mknod("/tmp/lxcfs-iwashere", S_IFREG, 0644);
@@ -803,7 +803,7 @@ static int proc_uptime_read(char *buf, size_t size, off_t offset,
        ssize_t total_len = 0, ret = 0;
        double busytime, idletime, reaperage;
 
-#if RELOADTEST
+#ifdef RELOADTEST
        iwashere();
 #endif
 

diff --git a/src/utils.h b/src/utils.h
index 6c1226dfdd7b29733eb994319ea7892030a8bcd5..e19eba49bcdac19a07cc3ddc8497d0ab20b8625d 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -45,14 +45,14 @@ extern int read_file_fuse_with_offset(const char *path, char *buf, size_t size,
 extern void prune_init_slice(char *cg);
 extern int wait_for_pid(pid_t pid);
 
-#ifndef HAVE_PIDFD_OPEN
+#if !HAVE_PIDFD_OPEN
 static inline int pidfd_open(pid_t pid, unsigned int flags)
 {
        return syscall(__NR_pidfd_open, pid, flags);
 }
 #endif
 
-#ifndef HAVE_PIDFD_SEND_SIGNAL
+#if !HAVE_PIDFD_SEND_SIGNAL
 static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
                                    unsigned int flags)
 {