tree-wide: fix HAVE_* checks

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

diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
index 218125c1a41a9a4d013ae6903745504d9f5c09f5..24baecc883df0d6936a7bd25bab5e6502195950c 100644 (file)
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -17,7 +17,7 @@
 #include "memory_utils.h"
 #include "process_utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 80fb49c36b8490f6b83152ffe5ede20d08b0f9f9..2a6da40e95f8ef6b5d684e890d734a9146be0555 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -304,7 +304,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,        \
  * Helper macro to define errno string.
  */
 #if HAVE_STRERROR_R
-       #ifndef HAVE_DECL_STRERROR_R
+       #if !HAVE_DECL_STRERROR_R
                #ifdef STRERROR_R_CHAR_P
                        char *strerror_r(int errnum, char *buf, size_t buflen);
                #else

diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
index ba20224aed4f165f1071583e5c26e3d651917034..7c8f5d86afdca20654e497e1e1c02108fcd4c4dc 100644 (file)
--- a/src/lxc/mainloop.c
+++ b/src/lxc/mainloop.c
@@ -84,7 +84,7 @@ static inline void cleanup_handler(struct lxc_async_descr *descr,
                delete_handler(handler);
 }
 
-#ifndef HAVE_LIBURING
+#if !HAVE_LIBURING
 static inline int __lxc_mainloop_io_uring(struct lxc_async_descr *descr,
                                          int timeout_ms)
 {
@@ -514,7 +514,7 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
        }
 
        if (descr->type == LXC_MAINLOOP_IO_URING) {
-#ifdef HAVE_LIBURING
+#if HAVE_LIBURING
                io_uring_queue_exit(descr->ring);
                munmap(descr->ring, sizeof(struct io_uring));
 #else

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index c9d4bcc9e6c5e5f5dabf33018559724974557b6d..3ae807f1e71fef08274513c35afc06f4d6d4c140 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -30,7 +30,7 @@
 #include "state.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/network.c b/src/lxc/network.c
index b87cf57e798cef3d70f9e8d615b9bb4e89d32bb8..ad43694f25e066009e86b3177aab372c456b34b4 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -39,7 +39,7 @@
 #include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 01167fa477cc52cef799aa6e40322821edac2e22..31e671062ff5e965cd9d6fc6615bb4d864244c84 100644 (file)
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -31,11 +31,11 @@
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCAT
+#if !HAVE_STRLCAT
 #include "strlcat.h"
 #endif
 

diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index 270eb057ebb00b418fdb84fd84655f9132d20e41..686a8986cf872ba7544fa083cc2c5cf58f227b76 100644 (file)
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -23,11 +23,11 @@
 #include "storage.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 
-#ifndef HAVE_STRLCAT
+#if !HAVE_STRLCAT
 #include "strlcat.h"
 #endif
 

diff --git a/src/lxc/storage/nbd.c b/src/lxc/storage/nbd.c
index e27a98102709fa9f2d95b5c5b18710addffddfe8..c35f9e8659f600bac92827945c17ae10f626804d 100644 (file)
--- a/src/lxc/storage/nbd.c
+++ b/src/lxc/storage/nbd.c
@@ -19,7 +19,7 @@
 #include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/storage/rbd.c b/src/lxc/storage/rbd.c
index e1505e264e314c1056d2604be656ec0b41e6ae9d..ea3593bd72bf290c90cc00fceed862018ac557e3 100644 (file)
--- a/src/lxc/storage/rbd.c
+++ b/src/lxc/storage/rbd.c
@@ -14,7 +14,7 @@
 #include "storage_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index 8fb8fe6b4e7f6babfa93efbf7a5d23f5d8cb12b9..c840c68ded1b5ff920e91a882ed72e2b5b3a1af4 100644 (file)
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -40,7 +40,7 @@
 #include "utils.h"
 #include "zfs.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c
index f506821599649bd09e9bb81e97d6035f9a308898..4f329bd907f8be144574171a90547ebb0679e087 100644 (file)
--- a/src/lxc/storage/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -28,7 +28,7 @@
 #include "syscall_wrappers.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/lxc/tools/include/getsubopt.c b/src/lxc/tools/include/getsubopt.c
index 96d582ac00579dd8012bce94acfd47e9d2d906de..01d91d690864eed2eb0b4ecb9b77aad98951ea51 100644 (file)
--- a/src/lxc/tools/include/getsubopt.c
+++ b/src/lxc/tools/include/getsubopt.c
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#ifndef HAVE_STRCHRNUL
+#if !HAVE_STRCHRNUL
 #include "strchrnul.h"
 #endif
 

diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 976efc36f4cb3416e1bf77719485cbd599325228..c7158cc0b8e2e582328a88ead9a59b4f06bc5519 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -24,7 +24,7 @@
 #include "storage_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_GETSUBOPT
+#if !HAVE_GETSUBOPT
 #include "include/getsubopt.h"
 #endif
 

diff --git a/src/tests/api_reboot.c b/src/tests/api_reboot.c
index bf051b8b57567987d09a6db24146506ae20a6545..af12d623744b0d27b0accac6cb2cf096d4a6ae67 100644 (file)
--- a/src/tests/api_reboot.c
+++ b/src/tests/api_reboot.c
@@ -31,7 +31,7 @@
 #include "lxctest.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/arch_parse.c b/src/tests/arch_parse.c
index 95792ddd176989503f4cc8714fb92730196f5170..f8a0a46d27c6b1b7c30c630158efdd242259bbfd 100644 (file)
--- a/src/tests/arch_parse.c
+++ b/src/tests/arch_parse.c
@@ -30,7 +30,7 @@
 #include "../lxc/lxc.h"
 #include "../lxc/memory_utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/attach.c b/src/tests/attach.c
index f4ff5efbb1d6e6c0dd7350af09a636432b892258..45c93390b04b5696c4cfda208d83e5c53208dd04 100644 (file)
--- a/src/tests/attach.c
+++ b/src/tests/attach.c
@@ -32,7 +32,7 @@
 
 #include <lxc/lxccontainer.h>
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
index 81b2162fe845358c85b0e0bbb5d694da58b55a4b..46ae0259d67419f08adc2fa987aab31f63e90c33 100644 (file)
--- a/src/tests/cgpath.c
+++ b/src/tests/cgpath.c
@@ -35,7 +35,7 @@
 #include "lxctest.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/device_add_remove.c b/src/tests/device_add_remove.c
index a03f7d19ab51e27e7fa8a6e1c816d17818deb3a1..eb146090fdca97fad5f9e62cb8031652aeae0846 100644 (file)
--- a/src/tests/device_add_remove.c
+++ b/src/tests/device_add_remove.c
@@ -24,7 +24,7 @@
 #include "memory_utils.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index 5ebe5508d2db9a932db9fa668f5238db101b23b8..e5836f3500a596a5cb4648a6874820960700eddc 100644 (file)
--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -31,7 +31,7 @@
 #include "lxctest.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif
 

diff --git a/src/tests/shortlived.c b/src/tests/shortlived.c
index c66e97ede2d306c5b98eb034a4e1eb2609b7c5ca..7c723ead27e5bf4653ba08fb24199276a5a9d3ed 100644 (file)
--- a/src/tests/shortlived.c
+++ b/src/tests/shortlived.c
@@ -31,7 +31,7 @@
 #include "lxctest.h"
 #include "utils.h"
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 #include "strlcpy.h"
 #endif