tree-wide: fix config.h inclusion

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

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index 4f8e2fad6649fde134f54b7c5ee7ddbd548207d5..7dae44c59d90f6dc4d822d483816d045a8fe06d8 100644 (file)
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
@@ -15,7 +14,6 @@
 #include <sys/un.h>
 
 #include "af_unix.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/af_unix.h b/src/lxc/af_unix.h
index 77c115a3b55f6bacee269ba69c31ba45806831e7..ba119cffc972c25548b2d6498dd1b6e9e5a015db 100644 (file)
--- a/src/lxc/af_unix.h
+++ b/src/lxc/af_unix.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_AF_UNIX_H
 #define __LXC_AF_UNIX_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/socket.h>
 #include <stddef.h>

diff --git a/src/lxc/api_extensions.h b/src/lxc/api_extensions.h
index 04e37fd54e72c2bf7106b6026245a4ba3bb5303a..bdffa649fc344bdd2b53e2c11bba417f1a332013 100644 (file)
--- a/src/lxc/api_extensions.h
+++ b/src/lxc/api_extensions.h
@@ -3,11 +3,11 @@
 #ifndef __LXC_API_EXTENSIONS_H
 #define __LXC_API_EXTENSIONS_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 /*
  * api_extensions is the list of all API extensions in the order they were
  * added.

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index a1b16607a079bdfe4779e3c8a42072026e88e202..93a1162eb57dc8f036a194d1078b482f052b435e 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -31,7 +30,6 @@
 #include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lsm/lsm.h"

diff --git a/src/lxc/attach.h b/src/lxc/attach.h
index d9b356bbf8eb6621485b095cda725be07877b92d..c85b84fbe3094602fc8b975fefebfed2abc68dd6 100644 (file)
--- a/src/lxc/attach.h
+++ b/src/lxc/attach.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_ATTACH_H
 #define __LXC_ATTACH_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <sys/types.h>
 

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 3103263b32258e38b978a8a6cf3ffa6d0caa802c..b111f521cf0098fa775b676f48523987032ffb66 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -14,10 +14,6 @@
 
 #include "config.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>

diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
index aef7ad84da59f41320fa14fcb50c47f53575cd3f..8f6e49e04f1a761cfd517612f33ccd3a141ba5c7 100644 (file)
--- a/src/lxc/cgroups/cgroup.c
+++ b/src/lxc/cgroups/cgroup.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -12,7 +11,6 @@
 #include "cgroup2_devices.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
 #include "memory_utils.h"
 #include "log.h"

diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
index 42285ff404f15c9d10f779f3c6fde5c8ca9473e1..d26559d111a33ed549b75620af26c4413c8879cf 100644 (file)
--- a/src/lxc/cgroups/cgroup.h
+++ b/src/lxc/cgroups/cgroup.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CGROUP_H
 #define __LXC_CGROUP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <linux/types.h>

diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c
index 5ccd35fd87a7f11c8d89340c593cfd8e2dc48d03..480859ccc6b3fc2be25e5b93d0cf1065deac9bbf 100644 (file)
--- a/src/lxc/cgroups/cgroup2_devices.c
+++ b/src/lxc/cgroups/cgroup2_devices.c
@@ -2,9 +2,8 @@
 
 /* Parts of this taken from systemd's implementation. */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -16,7 +15,6 @@
 #include <unistd.h>
 
 #include "cgroup2_devices.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/cgroups/cgroup2_devices.h b/src/lxc/cgroups/cgroup2_devices.h
index 31896d292c593f84570a60a07e63722bf64ab4a3..4b0fb736277230c298677a7b6ecd616a71e8a246 100644 (file)
--- a/src/lxc/cgroups/cgroup2_devices.h
+++ b/src/lxc/cgroups/cgroup2_devices.h
@@ -5,6 +5,8 @@
 #ifndef __LXC_CGROUP2_DEVICES_H
 #define __LXC_CGROUP2_DEVICES_H
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -18,7 +20,6 @@
 #include "cgroup.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "list.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/cgroups/cgroup_utils.c b/src/lxc/cgroups/cgroup_utils.c
index 78bd9ecb092ca5caf8e4aa8d62cd14b5a35393fd..c5fb91c2ffa0d0ff889422ec8228b391e6346fe8 100644 (file)
--- a/src/lxc/cgroups/cgroup_utils.c
+++ b/src/lxc/cgroups/cgroup_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +10,6 @@
 
 #include "cgroup.h"
 #include "cgroup_utils.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/cgroups/cgroup_utils.h b/src/lxc/cgroups/cgroup_utils.h
index b18621d30f2e4eb8db75efe3de8d496527989eb2..5b23e912f05967aaa03f508386040a5f4f23c0fe 100644 (file)
--- a/src/lxc/cgroups/cgroup_utils.h
+++ b/src/lxc/cgroups/cgroup_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CGROUP_UTILS_H
 #define __LXC_CGROUP_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 4c2f77adacb20ba8614011890a58f25434164713..4b52ff736a14b5b4594fceaba8c0bbc7ef39b48e 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <caps.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -22,7 +21,6 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lxc.h"

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 8f77880e6e29c5667d74296f935da7fbed436767..3558ff7e2fd4b173ab2adc6cc10ff299a184d6f0 100644 (file)
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -17,7 +15,6 @@
 #include "af_unix.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "file_utils.h"
 #include "initutils.h"
 #include "log.h"

diff --git a/src/lxc/commands_utils.h b/src/lxc/commands_utils.h
index 0bdf7a2e8e55f8933bfbe528fc5f32ae1310f894..28ce4907ae0e6025f26a58ab3486d4553c2c7429 100644 (file)
--- a/src/lxc/commands_utils.h
+++ b/src/lxc/commands_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_COMMANDS_UTILS_H
 #define __LXC_COMMANDS_UTILS_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "state.h"

diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index 4b2fc1b3a0a94a4e78a1a1b1165ebbaf05bd268d..ec071dc83ffbafcc3f584eb9bf768748cd9e3b7c 100644 (file)
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -3,15 +3,11 @@
 #ifndef __LXC_COMPILER_H
 #define __LXC_COMPILER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
 
 #include <stdbool.h>
 #include <linux/types.h>
 
-#include "config.h"
-
 #ifndef thread_local
 #if __STDC_VERSION__ >= 201112L &&    \
     !(defined(__STDC_NO_THREADS__) || \

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 6b1cfd4be605c5f734889ad3682f56a5a4f1f0d7..f4cb4b5e245641fb05da8aff79ce8d39a3c34052 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <dirent.h>
@@ -26,7 +24,6 @@
 
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "netns_ifaddrs.h"
@@ -36,7 +33,6 @@
 #include "memory_utils.h"
 #include "network.h"
 #include "parse.h"
-#include "storage/storage.h"
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index f085d1e22856affeaf4f9891c1592a35f8ec5dc2..d9b20c64e65c09c609d20dfb69d085c9ee31a2ea 100644 (file)
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CONFILE_H
 #define __LXC_CONFILE_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index ae05ddac3fe3dda8a39f65cab81a0f1ab2ba10bb..5534daa418281316781877c5409bb47186ed1ae5 100644 (file)
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -12,7 +11,6 @@
 #include "lxc.h"
 
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "error.h"

diff --git a/src/lxc/confile_utils.h b/src/lxc/confile_utils.h
index 7dae2aec7fcb085c1252626f483f991315107dba..ed7418dd646c8b40fc998d77c6f9a586e0da705b 100644 (file)
--- a/src/lxc/confile_utils.h
+++ b/src/lxc/confile_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CONFILE_UTILS_H
 #define __LXC_CONFILE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "compiler.h"

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 3d61bea6d4663442fc409b76bb825f5edf547dbc..3ee736922010297c2dded64238b34ebc7295ed82 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <inttypes.h>
 #include <linux/limits.h>
 #include <sched.h>
@@ -19,7 +18,6 @@
 #include "cgroup.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "criu.h"
 #include "log.h"
 #include "lxc.h"

diff --git a/src/lxc/criu.h b/src/lxc/criu.h
index 234f79b79c310622f99440ebf0c98f46e3926cea..873f887860ff40d98602005331520b423a3c5263 100644 (file)
--- a/src/lxc/criu.h
+++ b/src/lxc/criu.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CRIU_H
 #define __LXC_CRIU_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "lxc.h"

diff --git a/src/lxc/error.c b/src/lxc/error.c
index 51fe5092aa87f7c39546ec22616967b0bb52fb81..a3467d5179862160200d24b1205f51d92becad8d 100644 (file)
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>

diff --git a/src/lxc/error_utils.h b/src/lxc/error_utils.h
index ac0860d4f042b1f8988a71b701eb6a962e01b2c2..614dd344a2e6748d507c5e4c3e639805ff513da7 100644 (file)
--- a/src/lxc/error_utils.h
+++ b/src/lxc/error_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_ERROR_UTILS_H
 #define __LXC_ERROR_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "macro.h"

diff --git a/src/lxc/execute.c b/src/lxc/execute.c
index 346e127ab49ecbcf247565dced02c87edc482a52..6a7ae39f44a7d3c5c505983a363eebacf337f05c 100644 (file)
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +10,6 @@
 #include <unistd.h>
 
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "process_utils.h"

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index f7e4fb378ea5ead35277031a01e974f4981f8d66..ca31690e4460cbb6dbeac953d9468636fc3f5f1b 100644 (file)
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/magic.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h
index c9765da50b971b84c60b1692f59ebb991ee93a9b..7d2af012815ef8e4242f2ec29db35d4693a49eb1 100644 (file)
--- a/src/lxc/file_utils.h
+++ b/src/lxc/file_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_FILE_UTILS_H
 #define __LXC_FILE_UTILS_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
index ef6afa046c2fc06a82862623ba4366a2b924c42b..718fbff390d0f46331040d1ce434e810c000fc8e 100644 (file)
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -17,7 +16,6 @@
 #include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "error.h"
 #include "log.h"
 #include "lxc.h"

diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
index 397e94692c20ae0d6facfd59d7f4aaa61ad2ee50..218125c1a41a9a4d013ae6903745504d9f5c09f5 100644 (file)
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <pthread.h>
 #include <signal.h>
 #include <sys/prctl.h>
@@ -11,7 +10,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "error.h"
 #include "file_utils.h"
 #include "initutils.h"

diff --git a/src/lxc/list.h b/src/lxc/list.h
index c984af4512fe1cbf7599abb4a85433fc03638555..3b363a9b61f66ebe9bfb0bd0fde14ba0912de041 100644 (file)
--- a/src/lxc/list.h
+++ b/src/lxc/list.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LIST_H
 #define __LXC_LIST_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "memory_utils.h"

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 781cc2fa5b07ee5ae1af53d4ee0501fb2737a722..ac3713eccdc460c378424b6808b8703d8370132a 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -21,7 +19,6 @@
 #include "lxc.h"
 
 #include "caps.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "memory_utils.h"

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index 2d81acdc8e1427903f98be7c8d1c92896b00a31c..fa4e4d6e0b9c8bff74b174bf54df1bf232a5a197 100644 (file)
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +14,6 @@
 #include "caps.h"
 #include "cgroups/cgroup_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
 #include "file_utils.h"
 #include "log.h"

diff --git a/src/lxc/lsm/lsm.c b/src/lxc/lsm/lsm.c
index f6692e4eeeb35295169292f247e74f125115e40f..d9380c4b31ad4a66f694f4eef1d8e74cdd6b3c5b 100644 (file)
--- a/src/lxc/lsm/lsm.c
+++ b/src/lxc/lsm/lsm.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/mount.h>
@@ -11,7 +10,6 @@
 
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lsm.h"
 

diff --git a/src/lxc/lsm/lsm.h b/src/lxc/lsm/lsm.h
index bb6a7e93c170d8105beacaaae9d8f50c4605842e..a26abb812ba16f8b2fb9daf3a9a7680e62a5a4a6 100644 (file)
--- a/src/lxc/lsm/lsm.h
+++ b/src/lxc/lsm/lsm.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LSM_H
 #define __LXC_LSM_H
 
+#include "config.h"
+
 struct lxc_conf;
 
 #include <sys/types.h>

diff --git a/src/lxc/lsm/nop.c b/src/lxc/lsm/nop.c
index ff9c4b86ef1647a92f9da89bd8254710d65bae36..56b97aaf0ad2087e848e5f430ca9791b417d94a1 100644 (file)
--- a/src/lxc/lsm/nop.c
+++ b/src/lxc/lsm/nop.c
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 
-#include "config.h"
 #include "lsm/lsm.h"
 
 static char *nop_process_label_get(struct lsm_ops *ops, pid_t pid)

diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
index e0833f1b7bc3643f8962c86c3a024b4e75bcc24d..7a34b9cc46a80ac26b451921b61b98dc1c8fcbc4 100644 (file)
--- a/src/lxc/lsm/selinux.c
+++ b/src/lxc/lsm/selinux.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <selinux/selinux.h>
 #include <stdbool.h>
@@ -12,7 +11,6 @@
 #include <unistd.h>
 
 #include "conf.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "lsm.h"

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 9cf8da67abd0f1b16e33e21b2d29a0bb2d5f17da..8ba9f62a6ff66eb4c3680514d61bcd13435c2293 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LXC_H
 #define __LXC_LXC_H
 
+#include "config.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index e51a1c4636ddf2f4df97fe53f6f77e463687089d..ac4b312c0889ed8c2d60f1179a2edab46771214c 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -36,7 +35,6 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "criu.h"

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 3386bfff6d20c1b97ad7fa38d9f082b3343799e2..2663d5e24a34b8cecb092b3d8090df3a0f74df76 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_CONTAINER_H
 #define __LXC_CONTAINER_H
 
+#include "config.h"
+
 #include <malloc.h>
 #include <semaphore.h>
 #include <stdbool.h>

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 12be6ef00f71db1597e244e0a290325da192b60d..acddc1380216e39971f9ce5e45249842835b9f61 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <malloc.h>
@@ -14,7 +13,6 @@
 
 #include "lxc.h"
 
-#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "memory_utils.h"

diff --git a/src/lxc/lxclock.h b/src/lxc/lxclock.h
index 38f49b5b4b667418ce1024b296a2809630f82c7a..a20d35680189c79322dd0afca832795be9f09331 100644 (file)
--- a/src/lxc/lxclock.h
+++ b/src/lxc/lxclock.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LXCLOCK_H
 #define __LXC_LXCLOCK_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <semaphore.h>
 #include <string.h>

diff --git a/src/lxc/lxcseccomp.h b/src/lxc/lxcseccomp.h
index 41293bcea1cb6f1b64cb71cf73dd35c6f80bd77c..070dcaf5acdbf4e8b0a20669acf35604a05d5a12 100644 (file)
--- a/src/lxc/lxcseccomp.h
+++ b/src/lxc/lxcseccomp.h
@@ -3,9 +3,8 @@
 #ifndef __LXC_LXCSECCOMP_H
 #define __LXC_LXCSECCOMP_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #ifdef HAVE_SECCOMP
 #include <linux/seccomp.h>
@@ -18,7 +17,6 @@
 
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "memory_utils.h"
 
 struct lxc_conf;

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 2780c74546df72638240b406f52a2e30937d1c02..9054c326cb734f7c06c4afd41466c7ab400aeae9 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -3,10 +3,8 @@
 #ifndef __LXC_MACRO_H
 #define __LXC_MACRO_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <asm/types.h>
 #include <limits.h>
 #include <linux/if_link.h>
@@ -22,7 +20,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096

diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
index 69152a8971280c1af7526c0c61e7bc7edb41e2c4..ba20224aed4f165f1071583e5c26e3d651917034 100644 (file)
--- a/src/lxc/mainloop.c
+++ b/src/lxc/mainloop.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -12,7 +11,6 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "mainloop.h"

diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
index 0197ee2dd85589c356d3ae0ae4242d9b588a640c..6d6d38cf80c871c4e2511ac0ee9e61482b04101e 100644 (file)
--- a/src/lxc/mainloop.h
+++ b/src/lxc/mainloop.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_MAINLOOP_H
 #define __LXC_MAINLOOP_H
 
+#include "config.h"
+
 #include <stdint.h>
 
 #include "compiler.h"

diff --git a/src/lxc/memory_utils.h b/src/lxc/memory_utils.h
index f2352a175f20a0d94af7bac581c4c8132d710bbb..757fa49d9abf93506c0acbe5648afc3b99e93278 100644 (file)
--- a/src/lxc/memory_utils.h
+++ b/src/lxc/memory_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_MEMORY_UTILS_H
 #define __LXC_MEMORY_UTILS_H
 
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index b013551683586dd03e9a91b0dfbae00160616def..c9d4bcc9e6c5e5f5dabf33018559724974557b6d 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -22,7 +21,6 @@
 #include <unistd.h>
 
 #include "af_unix.h"
-#include "config.h"
 #include "error.h"
 #include "log.h"
 #include "lxclock.h"

diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h
index 0f89e4ff65a89e0582b47383c5b1225f02630146..ae1dcdf16194b4183591e9c1cda5257fe1102e9f 100644 (file)
--- a/src/lxc/monitor.h
+++ b/src/lxc/monitor.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_MONITOR_H
 #define __LXC_MONITOR_H
 
+#include "config.h"
+
 #include <limits.h>
 #include <poll.h>
 #include <sys/param.h>

diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c
index 945de8c1a346f553c68c2c9c65fa17bb91cfc1a2..bba75f933cc9dcddc7e9c422b13c5b2e4586eef3 100644 (file)
--- a/src/lxc/mount_utils.c
+++ b/src/lxc/mount_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/src/lxc/mount_utils.h b/src/lxc/mount_utils.h
index 7d6857866bcdbde342792ac0dbb6ca54340bb53e..ea392672d864ff23995862502f4ef4f8ce042ec1 100644 (file)
--- a/src/lxc/mount_utils.h
+++ b/src/lxc/mount_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_MOUNT_UTILS_H
 #define __LXC_MOUNT_UTILS_H
 
+#include "config.h"
+
 #include <linux/types.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/lxc/namespace.c b/src/lxc/namespace.c
index 020840d014ddc3992dc135a1415b937644d24822..d97d9b37b8466da673febd765da96fe56b2c360c 100644 (file)
--- a/src/lxc/namespace.c
+++ b/src/lxc/namespace.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "namespace.h"

diff --git a/src/lxc/namespace.h b/src/lxc/namespace.h
index a744edb78d3043d0140298ae72a5d68cc10bc769..587e00b3a685a99c8b0f86587229096fb292b284 100644 (file)
--- a/src/lxc/namespace.h
+++ b/src/lxc/namespace.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_NAMESPACE_H
 #define __LXC_NAMESPACE_H
 
+#include "config.h"
+
 #include <sched.h>
 #include <unistd.h>
 #include <sys/syscall.h>

diff --git a/src/lxc/network.c b/src/lxc/network.c
index 6c6715d574d7ab6b1519b8d0ce06f6d63522e24f..654561d44df12327561b950bb7f16b18a73c1784 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
@@ -29,7 +28,6 @@
 #include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/network.h b/src/lxc/network.h
index 2b5c0901c69d65c68bc645a8529a51f4e927d518..d5d3d54b647a7fb15807172f469eb9b9916fda72 100644 (file)
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_NETWORK_H
 #define __LXC_NETWORK_H
 
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <linux/types.h>
 #include <stdbool.h>

diff --git a/src/lxc/nl.c b/src/lxc/nl.c
index 27f62c50b545cd9741859742310a6396656dec47..63cbf5ac562a400e3a4aeec4ac7a37629facc69f 100644 (file)
--- a/src/lxc/nl.c
+++ b/src/lxc/nl.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -13,7 +12,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "nl.h"
 

diff --git a/src/lxc/nl.h b/src/lxc/nl.h
index 1135d1f6655d19aa4536df3539a22b1360edb744..28058bc0ea9026fb293a84977950938e83b44c66 100644 (file)
--- a/src/lxc/nl.h
+++ b/src/lxc/nl.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_NL_H
 #define __LXC_NL_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "compiler.h"

diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 91efe5c80618c7cc94e0721c6fb224bb2b06b7ef..01167fa477cc52cef799aa6e40322821edac2e22 100644 (file)
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -23,7 +22,6 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 5a5b8534587338bdaeeb2b373cbb188653a489b8..c174de96c272eee3ab766cc635ef547ff07d6107 100644 (file)
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
@@ -12,7 +11,6 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index e4808ed0fb0a537c6396cd2a14b2f8aa36bc93a2..fe3bb4b78b600fc72432d82d7ded56bd052e8d3e 100644 (file)
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_PARSE_H
 #define __LXC_PARSE_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 

diff --git a/src/lxc/process_utils.c b/src/lxc/process_utils.c
index 3dadeb7d7ae490191d65bc21cd5a0c8c6721f5fe..76e27da0fe63b96cd1abc719fee4ac12d47d1fa9 100644 (file)
--- a/src/lxc/process_utils.c
+++ b/src/lxc/process_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <sched.h>
 #include <signal.h>
@@ -12,7 +11,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "process_utils.h"

diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
index e0157c631b22829c91e8bb5b3fa57c26e196b0b6..2a5032c0328fefb9ba3e1fdee6fe35167be99392 100644 (file)
--- a/src/lxc/process_utils.h
+++ b/src/lxc/process_utils.h
@@ -3,9 +3,8 @@
 #ifndef __LXC_PROCESS_UTILS_H
 #define __LXC_PROCESS_UTILS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <linux/sched.h>
 #include <sched.h>
 #include <signal.h>
@@ -16,7 +15,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "syscall_numbers.h"
 
 #ifndef CSIGNAL

diff --git a/src/lxc/rexec.c b/src/lxc/rexec.c
index 2d6345651dc99d59f5871fc738cda867aa6265c5..ee0b453dbf324549bdf1791aeb2f0b1bf0ee7c9a 100644 (file)
--- a/src/lxc/rexec.c
+++ b/src/lxc/rexec.c
@@ -1,15 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/rexec.h b/src/lxc/rexec.h
index 198d6cb08fcf174b6f2de2cca871f8250d9579bf..c4967b08c5bbb313dbbe4ea192ff3619aa386892 100644 (file)
--- a/src/lxc/rexec.h
+++ b/src/lxc/rexec.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_REXEC_H
 #define __LXC_REXEC_H
 
+#include "config.h"
+
 #include "compiler.h"
 
 __hidden extern int lxc_rexec(const char *memfd_name);

diff --git a/src/lxc/ringbuf.c b/src/lxc/ringbuf.c
index 43f3636565b4b20a7bc686d507da1de4b813990d..37ffc8f39804ff694443d924c54a15a4dd67cc8e 100644 (file)
--- a/src/lxc/ringbuf.c
+++ b/src/lxc/ringbuf.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
@@ -13,7 +11,6 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "ringbuf.h"
 #include "syscall_wrappers.h"
 #include "utils.h"

diff --git a/src/lxc/ringbuf.h b/src/lxc/ringbuf.h
index 889b6e65ce37c49095eff7eded6efb0ad85b42ce..bd9a4de1e9f244b073711841703e8fdef04b4344 100644 (file)
--- a/src/lxc/ringbuf.h
+++ b/src/lxc/ringbuf.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_RINGBUF_H
 #define __LXC_RINGBUF_H
 
+#include "config.h"
+
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/src/lxc/rtnl.c b/src/lxc/rtnl.c
index cea7336c12ccb79c2b1ecec834cc308a24d8243e..d1fe585e848956b60001284b5853e692807d1e41 100644 (file)
--- a/src/lxc/rtnl.c
+++ b/src/lxc/rtnl.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -12,7 +11,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "nl.h"
 #include "rtnl.h"
 

diff --git a/src/lxc/rtnl.h b/src/lxc/rtnl.h
index bfe66db0507e2338934ea470d782d2796157db89..5578c6f627175d11afdc6f6108dc5f2a046637bc 100644 (file)
--- a/src/lxc/rtnl.h
+++ b/src/lxc/rtnl.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_RTNL_H
 #define __LXC_RTNL_H
 
+#include "config.h"
+
 #include <compiler.h>
 
 /*

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 2b9ecaf69d65e1796a35ce98a67492987e0ec7dc..6c56b8d0fb2cb343df41c24f68c44e0100c5a62d 100644 (file)
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <seccomp.h>
 #include <stdio.h>
@@ -15,7 +14,6 @@
 
 #include "af_unix.h"
 #include "commands.h"
-#include "config.h"
 #include "log.h"
 #include "lxcseccomp.h"
 #include "mainloop.h"

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 252fc8a8a5cc3d178a84a6b7ea27b678bc7af611..4eed60a21160501efb413e3d011bc88251510e4a 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -36,7 +35,6 @@
 #include "commands_utils.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "file_utils.h"

diff --git a/src/lxc/start.h b/src/lxc/start.h
index e3aa0e95e38b8e64a05039cb93a760e0eb93aa5a..86b4c29a4a9ed5bcbf4ebb2faec967a0167331bd 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_START_H
 #define __LXC_START_H
 
+#include "config.h"
+
 #include <linux/sched.h>
 #include <sched.h>
 #include <signal.h>

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 0682b35da58bdb27bd88126430493269403ad2b2..5e26855d92d1483216b4db966e84054fb5dfda33 100644 (file)
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -19,7 +18,6 @@
 #include "cgroup.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "log.h"
 #include "lxc.h"
 #include "monitor.h"

diff --git a/src/lxc/state.h b/src/lxc/state.h
index afb2fbb785b06fe1fe38cb85375dcbf7c8bd981e..39a6f962dd5d38640862d1927461b874c55993c2 100644 (file)
--- a/src/lxc/state.h
+++ b/src/lxc/state.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_STATE_H
 #define __LXC_STATE_H
 
+#include "config.h"
+
 #include "compiler.h"
 
 #define MAX_STATE_LENGTH (8 + 1)

diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index e0b7586c3e137ca8b10bbd88ba28310e6cb123b3..270eb057ebb00b418fdb84fd84655f9132d20e41 100644 (file)
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -18,7 +17,6 @@
 #include <unistd.h>
 
 #include "btrfs.h"
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "rsync.h"

diff --git a/src/lxc/storage/btrfs.h b/src/lxc/storage/btrfs.h
index 210a4e21d3712f0550307be821763879326ea265..72849f943be6c6a765ebba321bf892ccb1d35260 100644 (file)
--- a/src/lxc/storage/btrfs.h
+++ b/src/lxc/storage/btrfs.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_BTRFS_H
 #define __LXC_BTRFS_H
 
+#include "config.h"
+
 #include <byteswap.h>
 #include <linux/types.h> /* __le64, __l32 ... */
 #include <stdbool.h>

diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
index 03ad036d596ec6dd651abfd814f881ea8ade4d33..dca510140a191cdc9435bbdb5f8c7d768382d760 100644 (file)
--- a/src/lxc/storage/dir.c
+++ b/src/lxc/storage/dir.c
@@ -1,13 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"

diff --git a/src/lxc/storage/dir.h b/src/lxc/storage/dir.h
index 24d8c53ff26ae2b2aecfeb49c9cf09c9a92e2af5..c74e369cfc2ef568d92b438cb16137632260890b 100644 (file)
--- a/src/lxc/storage/dir.h
+++ b/src/lxc/storage/dir.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_DIR_H
 #define __LXC_DIR_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/loop.c b/src/lxc/storage/loop.c
index eebc1b67c4e58fe2225b85b5b5d62e74e6e28b40..870b84c52d47e8e0315cba0978cabb42f82a1f89 100644 (file)
--- a/src/lxc/storage/loop.c
+++ b/src/lxc/storage/loop.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -15,7 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "loop.h"
 #include "memory_utils.h"

diff --git a/src/lxc/storage/loop.h b/src/lxc/storage/loop.h
index 9b04f09b23c9a30aa2a0df156a90c4e4d3e7cd57..c9be261ab2d77236a23509384ad9cb80f631541f 100644 (file)
--- a/src/lxc/storage/loop.h
+++ b/src/lxc/storage/loop.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LOOP_H
 #define __LXC_LOOP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/lvm.c b/src/lxc/storage/lvm.c
index ed53bd086787c8aa2061c1b5beabee67a51d73fa..208dcc9d04b989b549f3f1b04a7a486c5e84bc79 100644 (file)
--- a/src/lxc/storage/lvm.c
+++ b/src/lxc/storage/lvm.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -13,7 +11,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "lvm.h"
 #include "memory_utils.h"

diff --git a/src/lxc/storage/lvm.h b/src/lxc/storage/lvm.h
index 8d3dd6a9f980401bea41a82cc2b39926c4aee486..7351e1a3ae2a348aaca253025a31f96479921ea4 100644 (file)
--- a/src/lxc/storage/lvm.h
+++ b/src/lxc/storage/lvm.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_LVM_H
 #define __LXC_LVM_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/nbd.c b/src/lxc/storage/nbd.c
index 06515b83343fb5721ad1995b08ceab01ec2a77f3..e27a98102709fa9f2d95b5c5b18710addffddfe8 100644 (file)
--- a/src/lxc/storage/nbd.c
+++ b/src/lxc/storage/nbd.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -12,7 +11,6 @@
 #include <sys/prctl.h>
 #include <sys/wait.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "nbd.h"

diff --git a/src/lxc/storage/nbd.h b/src/lxc/storage/nbd.h
index f6e4fb87c5500cb140fa9243179dd314432cae57..f9c53866303fe196303aaf69024f5a16742f2237 100644 (file)
--- a/src/lxc/storage/nbd.h
+++ b/src/lxc/storage/nbd.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_NBD_H
 #define __LXC_NBD_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
index 86c21a96db6e817b1d3f946f7f1ad51f181c0a51..f8094fadabab769f173d29ac50fe9b910d1cfa46 100644 (file)
--- a/src/lxc/storage/overlay.c
+++ b/src/lxc/storage/overlay.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +10,6 @@
 #include "lxc.h"
 
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/storage/overlay.h b/src/lxc/storage/overlay.h
index bed876e80713bda6cf1a68b73fd49bd1e03cbb52..a33961792ca88ce67ea35072a261d392b6337304 100644 (file)
--- a/src/lxc/storage/overlay.h
+++ b/src/lxc/storage/overlay.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_OVERLAY_H
 #define __LXC_OVERLAY_H
 
+#include "config.h"
+
 #include <grp.h>
 #include <stdio.h>
 #include <stdbool.h>

diff --git a/src/lxc/storage/rbd.c b/src/lxc/storage/rbd.c
index f387ac21a6427bbe61eb163ad718e9e60d6d0038..e1505e264e314c1056d2604be656ec0b41e6ae9d 100644 (file)
--- a/src/lxc/storage/rbd.c
+++ b/src/lxc/storage/rbd.c
@@ -1,16 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <inttypes.h>  /* Required for PRIu64 to work. */
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "storage.h"

diff --git a/src/lxc/storage/rbd.h b/src/lxc/storage/rbd.h
index 56bfcb214c09d7eaf4e08799fd7a44418bebb1da..45f299ad7da5e743a1b835bc5b610c2d3929151d 100644 (file)
--- a/src/lxc/storage/rbd.h
+++ b/src/lxc/storage/rbd.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_RDB_H
 #define __LXC_RDB_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/rsync.c b/src/lxc/storage/rsync.c
index c02a3f95d75b0a0662c60d0fd6445f422f95dfe4..572fe4a1b58be8d91300313cbfc270dafd58e515 100644 (file)
--- a/src/lxc/storage/rsync.c
+++ b/src/lxc/storage/rsync.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <grp.h>
 #include <sched.h>
 #include <stdint.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "rsync.h"
 #include "storage.h"

diff --git a/src/lxc/storage/rsync.h b/src/lxc/storage/rsync.h
index c9e3210a1a233c61adb12d09d6c3467bdc8ea2ba..ab30311c5df48b7191a4d245bacfecd52b22e8bd 100644 (file)
--- a/src/lxc/storage/rsync.h
+++ b/src/lxc/storage/rsync.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_RSYNC_H
 #define __LXC_RSYNC_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "compiler.h"

diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index e40ecee1fcb7dfab74dcd7222b4015c3cc903286..8fb8fe6b4e7f6babfa93efbf7a5d23f5d8cb12b9 100644 (file)
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -22,7 +21,6 @@
 
 #include "btrfs.h"
 #include "conf.h"
-#include "config.h"
 #include "dir.h"
 #include "error.h"
 #include "log.h"

diff --git a/src/lxc/storage/storage.h b/src/lxc/storage/storage.h
index 62ac75e2695495cee8680f63ec09c69491bc0699..001a39c3698025f506ca85fd8d940d1b3ceb11ed 100644 (file)
--- a/src/lxc/storage/storage.h
+++ b/src/lxc/storage/storage.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_STORAGE_H
 #define __LXC_STORAGE_H
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/mount.h>
 

diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c
index d3548d21ba31e10c22c32c980c94edfe7f7dfd0b..f506821599649bd09e9bb81e97d6035f9a308898 100644 (file)
--- a/src/lxc/storage/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -21,7 +20,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "nbd.h"
 #include "parse.h"

diff --git a/src/lxc/storage/storage_utils.h b/src/lxc/storage/storage_utils.h
index 470e754c9c9ff5a2d9af0b415418e873886f5e19..1ec9e0c3cc37da6d3cb293022fd8a5382eb4d61c 100644 (file)
--- a/src/lxc/storage/storage_utils.h
+++ b/src/lxc/storage/storage_utils.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_STORAGE_UTILS_H
 #define __LXC_STORAGE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
index 6e3c739afa891e8441b9fc5a4250a2bbe61dd6a2..8a9bc16f2368e6eeaebbde92be738edf95181d34 100644 (file)
--- a/src/lxc/storage/zfs.c
+++ b/src/lxc/storage/zfs.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -11,7 +10,6 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "parse.h"
 #include "rsync.h"

diff --git a/src/lxc/storage/zfs.h b/src/lxc/storage/zfs.h
index da8f66becc15720cc3bcd6596070cdb7ee5387a1..9890d377e6b1816395ca59c0f2de37e22a8f4e58 100644 (file)
--- a/src/lxc/storage/zfs.h
+++ b/src/lxc/storage/zfs.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_ZFS_H
 #define __LXC_ZFS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
index 7bf4f585a55531c71393f8d080e9ed765f92255f..7abbc537f7b805d7aacef3330ea5338b17c8849f 100644 (file)
--- a/src/lxc/string_utils.h
+++ b/src/lxc/string_utils.h
@@ -3,10 +3,10 @@
 #ifndef __LXC_STRING_UTILS_H
 #define __LXC_STRING_UTILS_H
 
-#include <stdarg.h>
-
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "initutils.h"
 #include "macro.h"
 

diff --git a/src/lxc/sync.c b/src/lxc/sync.c
index d8917ba7e2258ae11ca8a740db0fb795fb11abac..1075d987a4fcc29592ddab7bc0da4eba694163a0 100644 (file)
--- a/src/lxc/sync.c
+++ b/src/lxc/sync.c
@@ -1,15 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "sync.h"

diff --git a/src/lxc/sync.h b/src/lxc/sync.h
index c621f41f86d5d5adbf63badd7b9af7cb5c5e0b2f..6703eda027a6696b7a95e668ed789a2e0f0ed8d1 100644 (file)
--- a/src/lxc/sync.h
+++ b/src/lxc/sync.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_SYNC_H
 #define __LXC_SYNC_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "compiler.h"

diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h
index 97273b4490bb7fa4c44373a6390cdaa393e5dcfe..ae5fdd0641c64d562a911636d9823d5237ff4748 100644 (file)
--- a/src/lxc/syscall_numbers.h
+++ b/src/lxc/syscall_numbers.h
@@ -2,9 +2,8 @@
 #ifndef __LXC_SYSCALL_NUMBERS_H
 #define __LXC_SYSCALL_NUMBERS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>

diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h
index b545b0365860a1bdd73dade86a144c0ede8e93c8..10f2fff3481c337738b8c13ae713b556d138902b 100644 (file)
--- a/src/lxc/syscall_wrappers.h
+++ b/src/lxc/syscall_wrappers.h
@@ -3,9 +3,8 @@
 #ifndef __LXC_SYSCALL_WRAPPER_H
 #define __LXC_SYSCALL_WRAPPER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>
@@ -15,7 +14,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "macro.h"
 #include "syscall_numbers.h"
 

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index b86d8c59a4410633e6059199046add2f9e356ec2..8c84f2875d1ded2cc6e44d5e140aa6b6ff628f68 100644 (file)
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
@@ -20,7 +19,6 @@
 #include "caps.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "mainloop.h"

diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index 194f887113b49d0c4a0d4e6da2cdc6c9ebcd9834..45d6a18ccfd42f587a730f90b0b0b2265e459aa9 100644 (file)
--- a/src/lxc/terminal.h
+++ b/src/lxc/terminal.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_TERMINAL_H
 #define __LXC_TERMINAL_H
 
+#include "config.h"
+
 #include <signal.h>
 #include <stdio.h>
 

diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index 6a9ac817b746c49b32f9676c47f676162d61dd60..d7888ddf420068db0c1480c6c84062565cb111d4 100644 (file)
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -20,7 +19,6 @@
 #include "arguments.h"
 #include "attach.h"
 #include "caps.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #ifdef ENFORCE_MEMFD_REXEC

diff --git a/src/lxc/tools/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c
index 4a50318109151e7749e664b11229cd9c2866f8c5..91596d4f6e260f255b93d396dedb0fe1ad78c51d 100644 (file)
--- a/src/lxc/tools/lxc_autostart.c
+++ b/src/lxc/tools/lxc_autostart.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +10,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "list.h"
 #include "log.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_cgroup.c b/src/lxc/tools/lxc_cgroup.c
index edfc03c28dc15c9e2f6b66b09c98f19914b61f24..eb96c63ee4ae66a70747459a559e5f65a3fdf986 100644 (file)
--- a/src/lxc/tools/lxc_cgroup.c
+++ b/src/lxc/tools/lxc_cgroup.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,7 +12,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_cgroup, lxc);

diff --git a/src/lxc/tools/lxc_checkpoint.c b/src/lxc/tools/lxc_checkpoint.c
index 22abf1866f2ef02a0385c4ee2c94bff4d122234f..a8edb4526cb98f4f8f927b0f34173f143a19e22f 100644 (file)
--- a/src/lxc/tools/lxc_checkpoint.c
+++ b/src/lxc/tools/lxc_checkpoint.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -13,7 +12,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_config.c b/src/lxc/tools/lxc_config.c
index 333dde54fe53e7114d97630b82cf4852be10e177..e4424c4cf779d8aa6f8eec2bf08788a3b125fb8a 100644 (file)
--- a/src/lxc/tools/lxc_config.c
+++ b/src/lxc/tools/lxc_config.c
@@ -1,15 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
 #include "lxc.h"
 
-#include "config.h"
-
 struct lxc_config_items {
        char *name;
 };

diff --git a/src/lxc/tools/lxc_console.c b/src/lxc/tools/lxc_console.c
index d11827121a3d8aa6de97cccd1fe581bbc0e21de1..7f43f506b7b08f5153239e12b3dcb941252131a5 100644 (file)
--- a/src/lxc/tools/lxc_console.c
+++ b/src/lxc/tools/lxc_console.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
@@ -20,7 +19,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 384a7e3c88aa9a4bc0d4d084b8933e3dcac850ad..d497610d07571ee356f8299b4ce535538756a135 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -21,7 +20,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "storage_utils.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_create.c b/src/lxc/tools/lxc_create.c
index 6af5540318da20b829d1f1f4e05a83a44e0fdd52..f0482867a1895a320944f69d8bd9a688c2094ae7 100644 (file)
--- a/src/lxc/tools/lxc_create.c
+++ b/src/lxc/tools/lxc_create.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdint.h>
@@ -14,7 +13,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "storage_utils.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_device.c b/src/lxc/tools/lxc_device.c
index ed69cdfd74c2088a16b6e4f11348cffe68cd6b68..82e54346218d946dbeb8de0872c7ff5c52a469ac 100644 (file)
--- a/src/lxc/tools/lxc_device.c
+++ b/src/lxc/tools/lxc_device.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
@@ -14,7 +13,6 @@
 
 #include "netns_ifaddrs.h"
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_execute.c b/src/lxc/tools/lxc_execute.c
index a706d94db5a0fd9d9e040791b5d43041a801489a..5b6a863b4541773e29f5e6f64ff89dfaadea8f53 100644 (file)
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
@@ -18,7 +17,6 @@
 
 #include "arguments.h"
 #include "caps.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_freeze.c b/src/lxc/tools/lxc_freeze.c
index cf5ff616239934bb9061ab1965c75bfd1aac5965..c18779ba3458820f8d74bbd4ec44e17943772987 100644 (file)
--- a/src/lxc/tools/lxc_freeze.c
+++ b/src/lxc/tools/lxc_freeze.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -12,7 +11,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_freeze, lxc);

diff --git a/src/lxc/tools/lxc_info.c b/src/lxc/tools/lxc_info.c
index 12b2562d37cf80afd7744ad1365de1b59ef87300..9755a503d23dbfcdb82f7bdd4fcced042aa42e86 100644 (file)
--- a/src/lxc/tools/lxc_info.c
+++ b/src/lxc/tools/lxc_info.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -15,7 +14,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index cc64f873222ff8d5a826df12ef0b85c6c055a639..23bee59de7d297546a30bdcabc3e168297790fdc 100644 (file)
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#include <dirent.h>
+#include "config.h"
+
 #include <getopt.h>
 #include <limits.h>
 #include <regex.h>
@@ -22,7 +20,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c
index aeb5ed8d0dfb9960f336ec93ce64dbd7cc8621c8..6065f26830a775f074af7a4dfe01877748aab1f5 100644 (file)
--- a/src/lxc/tools/lxc_monitor.c
+++ b/src/lxc/tools/lxc_monitor.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -27,7 +25,6 @@
 
 #include "af_unix.h"
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "monitor.h"

diff --git a/src/lxc/tools/lxc_snapshot.c b/src/lxc/tools/lxc_snapshot.c
index a920a595c330d64377929bc13b2e484363f9ca43..fc2e91c6b75f88c6e46498ba02603927a4c66b33 100644 (file)
--- a/src/lxc/tools/lxc_snapshot.c
+++ b/src/lxc/tools/lxc_snapshot.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <fcntl.h>
 #include <libgen.h>
@@ -15,7 +14,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_snapshot, lxc);

diff --git a/src/lxc/tools/lxc_stop.c b/src/lxc/tools/lxc_stop.c
index e3cecb6b26d8f3a7dd4ae15239d3f3b8d181bcef..8787bacd548a5913206b5c7e521ece5d9fc2ecba 100644 (file)
--- a/src/lxc/tools/lxc_stop.c
+++ b/src/lxc/tools/lxc_stop.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -12,7 +11,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_top.c b/src/lxc/tools/lxc_top.c
index 35fe76b5ae7c7b42688331ee1a3b11072c39dd54..d3db4142c761089be7ad6b54a565e3e34b1eaddb 100644 (file)
--- a/src/lxc/tools/lxc_top.c
+++ b/src/lxc/tools/lxc_top.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <inttypes.h>
 #include <signal.h>
@@ -21,7 +19,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "mainloop.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_unfreeze.c b/src/lxc/tools/lxc_unfreeze.c
index e5b287289cccf1241d30b56b63ba724b67282e33..818447cadc9483c966c72196a72d409ca818ce6e 100644 (file)
--- a/src/lxc/tools/lxc_unfreeze.c
+++ b/src/lxc/tools/lxc_unfreeze.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -12,7 +11,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_unfreeze, lxc);

diff --git a/src/lxc/tools/lxc_unshare.c b/src/lxc/tools/lxc_unshare.c
index c77ac70e7a446ed11c8f0dd122857b809ff42cac..d53f4299b5cfb01eeccd7825463958be374b2a0d 100644 (file)
--- a/src/lxc/tools/lxc_unshare.c
+++ b/src/lxc/tools/lxc_unshare.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -22,7 +21,6 @@
 
 #include "arguments.h"
 #include "caps.h"
-#include "config.h"
 #include "list.h"
 #include "log.h"
 #include "namespace.h"

diff --git a/src/lxc/tools/lxc_wait.c b/src/lxc/tools/lxc_wait.c
index 27f8020d77287c84e30fd897eec4d40b5fd0c12f..7bafbd52ccbcfd82bc87567c87d519b2d7ec4779 100644 (file)
--- a/src/lxc/tools/lxc_wait.c
+++ b/src/lxc/tools/lxc_wait.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <libgen.h>
 #include <signal.h>
 #include <stdio.h>
@@ -14,7 +13,6 @@
 #include "lxc.h"
 
 #include "arguments.h"
-#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_wait, lxc);