tree-wide: fix includes to fix bionic builds

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

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index e0231f3a22fb3d633805a9b646668f685e89b9fc..648c7d2a8d87f3ecd45f06d65984fb05cbcd44e3 100644 (file)
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -20,8 +20,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "config.h"
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
@@ -33,6 +35,7 @@
 #include <sys/syscall.h>
 #include <sys/un.h>
 
+#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/api_extensions.h b/src/lxc/api_extensions.h
index 3cac925a4aa1259c5e29e76460554285bf07b50f..226567f6651c77848333fb6cfcb6557c7ec7e797 100644 (file)
--- a/src/lxc/api_extensions.h
+++ b/src/lxc/api_extensions.h
@@ -20,7 +20,6 @@
 #ifndef __LXC_API_EXTENSIONS_H
 #define __LXC_API_EXTENSIONS_H
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 4c01dea1802b15ac361761a5f566d248e816c46e..733f3da36effbbe2591fc21d3d8689e1472f4e2d 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>

diff --git a/src/lxc/caps.c b/src/lxc/caps.c
index f0e662be9e9eb5d293bc6a2aa5a0505460abeec1..2578d3ba499eb5c4735c17aca4c91e9addcead9d 100644 (file)
--- a/src/lxc/caps.c
+++ b/src/lxc/caps.c
@@ -21,9 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
@@ -32,6 +32,7 @@
 #include <sys/prctl.h>
 
 #include "caps.h"
+#include "config.h"
 #include "log.h"
 #include "macro.h"
 

diff --git a/src/lxc/caps.h b/src/lxc/caps.h
index 14c498ae7baf6e690952accb2a35becc17395a9f..3f9aed50f4ba610558d200f404593fe39af8cdc3 100644 (file)
--- a/src/lxc/caps.h
+++ b/src/lxc/caps.h
@@ -24,9 +24,10 @@
 #ifndef __LXC_CAPS_H
 #define __LXC_CAPS_H
 
-#include "config.h"
 #include <stdbool.h>
 
+#include "config.h"
+
 #if HAVE_LIBCAP
 #include <linux/types.h> /* workaround for libcap < 2.17 bug */
 #include <sys/capability.h>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 5475f7eff0f5502ed52b3d99597296ab94544697..5a3ee1b8079cbe1ab116c25ae4359783986094ea 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -34,26 +34,28 @@
  * a comman-separated list of controllers.
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
+#include <linux/kdev_t.h>
+#include <linux/types.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <linux/kdev_t.h>
-#include <linux/types.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "caps.h"
 #include "cgroup.h"
 #include "cgroup_utils.h"
 #include "commands.h"
 #include "conf.h"
+#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "storage/storage.h"

diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
index cf81f3edbf85cfb2082a29429cb601973f7560bd..916a041bf7445abc8f2f28321868a20ef7b84edd 100644 (file)
--- a/src/lxc/cgroups/cgroup.c
+++ b/src/lxc/cgroups/cgroup.c
@@ -21,13 +21,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "cgroup.h"
 #include "conf.h"
+#include "config.h"
 #include "initutils.h"
 #include "log.h"
 #include "start.h"

diff --git a/src/lxc/cgroups/cgroup_utils.c b/src/lxc/cgroups/cgroup_utils.c
index 8e2a40eda03fd0e868f255e76043c8ac472ff3e5..5a44f36db906d637e7757e14df1f2415dc2a43f5 100644 (file)
--- a/src/lxc/cgroups/cgroup_utils.c
+++ b/src/lxc/cgroups/cgroup_utils.c
@@ -22,14 +22,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "cgroup_utils.h"
+#include "config.h"
+#include "macro.h"
 #include "utils.h"
 
 int get_cgroup_version(char *line)

diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index c052fee80ad026027cf0c1b6ea13419603bdec81..b6c7ca3d568da9861ab53fb53f44b9131fe9488f 100644 (file)
--- a/src/lxc/cmd/lxc_init.c
+++ b/src/lxc/cmd/lxc_init.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
@@ -40,6 +42,7 @@
 #include <lxc/version.h>
 
 #include "compiler.h"
+#include "config.h"
 #include "error.h"
 #include "initutils.h"
 #include "log.h"

diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index fe0ba7f3565c2ab61b966f5e6217197f46209f02..466bc6f20686fb749616e103af7d0a73cd565645 100644 (file)
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/src/lxc/cmd/lxc_monitord.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <net/if.h>
@@ -43,6 +45,7 @@
 #include <lxc/lxccontainer.h>
 
 #include "af_unix.h"
+#include "config.h"
 #include "log.h"
 #include "mainloop.h"
 #include "monitor.h"

diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
index e25ac10bb18be5f36ab0fe9f8c39a2f40d4f3e81..9a4dd8af2b54737541ee213d2045e41e174ecad0 100644 (file)
--- a/src/lxc/cmd/lxc_user_nic.c
+++ b/src/lxc/cmd/lxc_user_nic.c
@@ -17,26 +17,27 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <alloca.h>
+#include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
-#include <pwd.h>
-#include <sched.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <arpa/inet.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
+#include <pwd.h>
+#include <sched.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -44,6 +45,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "log.h"

diff --git a/src/lxc/cmd/lxc_usernsexec.c b/src/lxc/cmd/lxc_usernsexec.c
index e5b5d1f0196b564145bba4e26ee4a25ffa98b1b6..db4e1dac096620ab0803e2a39c5e5e22faf41a3e 100644 (file)
--- a/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@ -22,8 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -42,6 +43,7 @@
 #include <unistd.h>
 
 #include "conf.h"
+#include "config.h"
 #include "list.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 4d542eb9480e0f98fbf422976ec1baca809f8d84..4a8c24a37d7ed23131c77dd1fc5ec2e15a057e6f 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -21,8 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <caps.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -31,16 +32,17 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include "af_unix.h"
 #include "cgroup.h"
 #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 d079d7116912b91c460a1458708e058b9c01c3d9..5d5f55f794ed363297018a9a1357e3d4a45353b9 100644 (file)
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -17,22 +17,25 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include "af_unix.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "initutils.h"
+#include "config.h"
 #include "file_utils.h"
+#include "initutils.h"
 #include "log.h"
 #include "lxclock.h"
 #include "monitor.h"

diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index 12214b9b1ee9925eecb64b0ef9c7285319c070e5..5d1c0561ba493cd5a142212e8f33df8f9ebc9c43 100644 (file)
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -20,6 +20,9 @@
 #ifndef __LXC_COMPILER_H
 #define __LXC_COMPILER_H
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <sys/cdefs.h>
 
 #include "config.h"

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 7070516d6f3ecfa87efe3532306a7b7a3baecac2..93651170195bee2163c83ad13de8790fb128ddf9 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -21,10 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include "config.h"
-#include "confile.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -55,6 +54,29 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "af_unix.h"
+#include "caps.h"
+#include "cgroup.h"
+#include "conf.h"
+#include "config.h"
+#include "confile.h"
+#include "confile_utils.h"
+#include "error.h"
+#include "log.h"
+#include "lsm/lsm.h"
+#include "lxclock.h"
+#include "lxcseccomp.h"
+#include "macro.h"
+#include "namespace.h"
+#include "network.h"
+#include "parse.h"
+#include "ringbuf.h"
+#include "start.h"
+#include "storage.h"
+#include "storage/overlay.h"
+#include "terminal.h"
+#include "utils.h"
+
 #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
 #endif
@@ -91,27 +113,6 @@
 #include <../include/prlimit.h>
 #endif
 
-#include "af_unix.h"
-#include "caps.h"
-#include "cgroup.h"
-#include "conf.h"
-#include "confile_utils.h"
-#include "error.h"
-#include "log.h"
-#include "lsm/lsm.h"
-#include "lxclock.h"
-#include "lxcseccomp.h"
-#include "macro.h"
-#include "namespace.h"
-#include "network.h"
-#include "parse.h"
-#include "ringbuf.h"
-#include "start.h"
-#include "storage.h"
-#include "storage/overlay.h"
-#include "terminal.h"
-#include "utils.h"
-
 lxc_log_define(conf, lxc);
 
 /* The lxc_conf of the container currently being worked on in an API call.

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 7d206a3af7311ce5f689d627d694141cfc9a667d..befadc8cd96385e266af8f1f5cc0a1edb66e6bfe 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -23,27 +23,29 @@
 #ifndef __LXC_CONF_H
 #define __LXC_CONF_H
 
-#include "config.h"
-
-#include <stdio.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <linux/magic.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <sys/param.h>
 #include <sys/types.h>
-#include <stdbool.h>
 #include <sys/vfs.h>
 
-#if HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
 #include "compiler.h"
+#include "config.h"
 #include "list.h"
 #include "ringbuf.h"
-#include "start.h" /* for lxc_handler */
+#include "start.h"
 #include "terminal.h"
 
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 #if HAVE_SCMP_FILTER_CTX
 typedef void * scmp_filter_ctx;
 #endif

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 6312fdf90c2a25ce85e71cbff9e0b0ede8e01832..8e13b123d95a9054ca4e5ebda0fba26a5045e37e 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -22,33 +22,35 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS
+#include <arpa/inet.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <net/if.h>
+#include <netinet/in.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netinet/in.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "conf.h"
 #include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
-#include <../include/netns_ifaddrs.h>
+#include "../include/netns_ifaddrs.h"
 #include "log.h"
 #include "lxcseccomp.h"
 #include "network.h"

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index 4a22fdb6c686e8efea7ead4c048511470f7da4fe..36341fb73c1dee171769d5850b256a4ee699de16 100644 (file)
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -17,15 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <arpa/inet.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.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 10077bf679bec4f13cd045ac41756fc9d9da0d28..e381cbe6480229560cf9f024931e0e262342b5be 100644 (file)
--- a/src/lxc/confile_utils.h
+++ b/src/lxc/confile_utils.h
@@ -20,8 +20,6 @@
 #ifndef __LXC_CONFILE_UTILS_H
 #define __LXC_CONFILE_UTILS_H
 
-#include "config.h"
-
 #include <stdbool.h>
 
 #include "conf.h"

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index ffcb1bb0f955243ef27ec73f15387f1db2cb4737..66470a016ab0610bd060412a0c463e52f1dadaee 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -20,7 +20,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define _GNU_SOURCE
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <inttypes.h>
 #include <linux/limits.h>
 #include <sched.h>
@@ -32,11 +35,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include "cgroup.h"
-#include "conf.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 9f842a90e912f6946f048afed3338af5d7e040ab..fd125976ace325c286187abc510abb2a5956ee3f 100644 (file)
--- a/src/lxc/criu.h
+++ b/src/lxc/criu.h
@@ -27,9 +27,9 @@
 
 #include <lxc/lxccontainer.h>
 
-bool __criu_pre_dump(struct lxc_container *c, struct migrate_opts *opts);
-bool __criu_dump(struct lxc_container *c, struct migrate_opts *opts);
-bool __criu_restore(struct lxc_container *c, struct migrate_opts *opts);
-bool __criu_check_feature(uint64_t *features_to_check);
+extern bool __criu_pre_dump(struct lxc_container *c, struct migrate_opts *opts);
+extern bool __criu_dump(struct lxc_container *c, struct migrate_opts *opts);
+extern bool __criu_restore(struct lxc_container *c, struct migrate_opts *opts);
+extern bool __criu_check_feature(uint64_t *features_to_check);
 
 #endif

diff --git a/src/lxc/execute.c b/src/lxc/execute.c
index 163f3f4731000ac4f976f8f70cdd1ffd6f98a72a..cdf5bc848f7896439ef427682b6a81ca91a90330 100644 (file)
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -21,15 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "conf.h"
+#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "utils.h"

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 9a7bd160e1cd556605f045160cea8098c361a830..891aa0ffd4eff9689e3fab4aee0d106e465bdda8 100644 (file)
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -17,8 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/magic.h>
@@ -26,6 +27,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h
index 7ae28697530128e619af40c1a8069efbb71cda29..92e29f4e921d1f129814a5b9dab46cfb82480d4d 100644 (file)
--- a/src/lxc/file_utils.h
+++ b/src/lxc/file_utils.h
@@ -20,8 +20,6 @@
 #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 b6caec1788a0e056fe98952f619e61c704ba07d5..88f69222faf801596417b06187855917b7ba73b5 100644 (file)
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -20,19 +20,22 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "config.h"
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include <sys/param.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "cgroup.h"
 #include "commands.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 4257ffeaa979b48e81a27429f3df332354c8ffa6..79333e272757c73609cc6ea5ecbae8945da4e15f 100644 (file)
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -21,14 +21,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <sys/prctl.h>
 
+#include "compiler.h"
+#include "config.h"
 #include "file_utils.h"
 #include "initutils.h"
 #include "log.h"
 #include "macro.h"
-#include "compiler.h"
 
 #ifndef HAVE_STRLCPY
 #include "include/strlcpy.h"

diff --git a/src/lxc/initutils.h b/src/lxc/initutils.h
index 4af8c3e6ca720573b3fee6c833a8a1324477f015..6bf23a7060df67c3a922e25f862e46755ce8cb4c 100644 (file)
--- a/src/lxc/initutils.h
+++ b/src/lxc/initutils.h
@@ -24,8 +24,6 @@
 #ifndef __LXC_INITUTILS_H
 #define __LXC_INITUTILS_H
 
-#include "config.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 4fd3fb75edbd2f4d93a59ac6a41031e9e0aaeb1a..203accc31a9edc4e1668778386337a7cc30c4bee 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -21,29 +21,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
-#include <stdint.h>
-#include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
 #include <pthread.h>
-
-#include <syslog.h>
+#include <stdint.h>
 #include <stdio.h>
-
-#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <syslog.h>
+#include <unistd.h>
 
-#include "log.h"
 #include "caps.h"
-#include "utils.h"
+#include "config.h"
+#include "log.h"
 #include "lxccontainer.h"
+#include "utils.h"
 
 #ifndef HAVE_STRLCPY
 #include "include/strlcpy.h"

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 9cab04a13acc520d07caaa856627583e7ea30db7..7760f63b77da52108b43d802c9a51e4aa436a3bf 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -24,8 +24,6 @@
 #ifndef __LXC_LOG_H
 #define __LXC_LOG_H
 
-#include "config.h"
-
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index ff5378f62fa292b2d49fe26e513e5bc2a47e03d1..8c833ce75408ef7593fb9c55ac6c4d25040dab40 100644 (file)
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -18,23 +18,26 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/vfs.h>
+#include <unistd.h>
 
-#include "log.h"
-#include "lsm.h"
+#include "caps.h"
 #include "conf.h"
-#include "utils.h"
+#include "config.h"
 #include "initutils.h"
-#include "caps.h"
+#include "log.h"
+#include "lsm.h"
 #include "parse.h"
+#include "utils.h"
 
 lxc_log_define(apparmor, lsm);
 

diff --git a/src/lxc/lsm/lsm.c b/src/lxc/lsm/lsm.c
index 46e2120690ee8993b1ce7765add53bdfcc61f68c..5538c9e8482dc3b974587e8b5919282d5aed455e 100644 (file)
--- a/src/lxc/lsm/lsm.c
+++ b/src/lxc/lsm/lsm.c
@@ -21,14 +21,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/mount.h>
 #include <sys/param.h>
+#include <unistd.h>
 
 #include "conf.h"
+#include "config.h"
 #include "log.h"
 #include "lsm.h"
 

diff --git a/src/lxc/lsm/nop.c b/src/lxc/lsm/nop.c
index 9397f2bfb5d7a34f57d4a5bf880876f797f0f0c9..07bc6351f45e3ee256b89c3e4afd2d4af0b79454 100644 (file)
--- a/src/lxc/lsm/nop.c
+++ b/src/lxc/lsm/nop.c
@@ -21,7 +21,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdlib.h>
+
+#include "config.h"
 #include "lsm/lsm.h"
 
 static char *nop_process_label_get(pid_t pid)

diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
index 9f7b7bc31334b7a9b636776e89ab4711eea87c11..625bcae908d0c6300974382e53602fd3821d6b7e 100644 (file)
--- a/src/lxc/lsm/selinux.c
+++ b/src/lxc/lsm/selinux.c
@@ -21,16 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
-#include <stdlib.h>
+#include <selinux/selinux.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <selinux/selinux.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "conf.h"
+#include "config.h"
 #include "log.h"
 #include "lsm.h"
 

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 237d74750c5503b7d16184eb3be7a0bdf3a21e6d..97bf7a5e5a0a92c134b28aaaeb40ee288600e7bc 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -31,6 +31,7 @@ extern "C" {
 #include <stddef.h>
 #include <sys/select.h>
 #include <sys/types.h>
+
 #include "state.h"
 
 struct lxc_msg;

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 412fe0456c5920701fed8a90b4e2cd3eb081e36f..0d9276492086c944a8c9adc64557a353d66192ba 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -18,7 +18,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -41,6 +43,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "../include/netns_ifaddrs.h"
 #include "af_unix.h"
 #include "api_extensions.h"
 #include "attach.h"
@@ -53,7 +56,6 @@
 #include "confile_utils.h"
 #include "criu.h"
 #include "error.h"
-#include <../include/netns_ifaddrs.h>
 #include "initutils.h"
 #include "log.h"
 #include "lxc.h"

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 459531076ecd4f4b3f6dc6bdc1dbc4dab2940a0d..cb0cf8d2d4f246308ed21923bf507d8dedeb2be5 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -22,11 +22,12 @@
 
 #ifndef __LXC_CONTAINER_H
 #define __LXC_CONTAINER_H
+
 #include <malloc.h>
 #include <semaphore.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include <lxc/attach_options.h>
 

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 190352fb93a364cb1c5368d3e6097c4f25c769f6..e3d4654b35330e4ecc0b9395197ced7bb562870d 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -18,7 +18,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <malloc.h>
@@ -30,9 +32,10 @@
 
 #include <lxc/lxccontainer.h>
 
+#include "config.h"
+#include "log.h"
 #include "lxclock.h"
 #include "utils.h"
-#include "log.h"
 
 #ifdef MUTEX_DEBUGGING
 #include <execinfo.h>

diff --git a/src/lxc/lxclock.h b/src/lxc/lxclock.h
index 02b471fda56e4fbda774f9d7ca6da9e06363d0b7..364a71b8e7f7fb2ab5bc841f3874b2128747fc4d 100644 (file)
--- a/src/lxc/lxclock.h
+++ b/src/lxc/lxclock.h
@@ -26,8 +26,8 @@
 #include <fcntl.h>
 #include <semaphore.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/file.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index c9b46bd2131569b5b74e70fc6c54d1a070a8daca..471e34f4e36f46b5fb00de55c67ce28c067024ad 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -20,8 +20,6 @@
 #ifndef __LXC_MACRO_H
 #define __LXC_MACRO_H
 
-#include "config.h"
-
 #include <asm/types.h>
 #include <linux/if_link.h>
 #include <linux/loop.h>

diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
index 84dfb39e968d1c51e2be7af9e7e06d818457c69a..b169aa6fe2cd3f5fdcfe197d4cc00f31398b63a3 100644 (file)
--- a/src/lxc/mainloop.c
+++ b/src/lxc/mainloop.c
@@ -21,14 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/epoll.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "mainloop.h"
 
 struct mainloop_handler {

diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
index 44f76a443555739a0005c0bcc3254b8bb29ec045..903246a19f80fa8c5745de6fc3daf5c7fd2cb508 100644 (file)
--- a/src/lxc/mainloop.h
+++ b/src/lxc/mainloop.h
@@ -25,6 +25,7 @@
 #define __LXC_MAINLOOP_H
 
 #include <stdint.h>
+
 #include "list.h"
 
 #define LXC_MAINLOOP_ERROR -1

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 4cca9002ce820db04ef8ba16e627671574812c91..4a5b9a985c284082e5edd0c96ae0bc78032fbf68 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -22,27 +22,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <net/if.h>
+#include <netinet/in.h>
 #include <poll.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <net/if.h>
-#include <netinet/in.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
-#include "config.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 97e995a8f25b1836df73978641e0d9fa8f43ad5f..d13a612526c29a1c021556b33ce1ab69bfc2fd06 100644 (file)
--- a/src/lxc/monitor.h
+++ b/src/lxc/monitor.h
@@ -24,9 +24,9 @@
 #define __LXC_MONITOR_H
 
 #include <limits.h>
+#include <poll.h>
 #include <sys/param.h>
 #include <sys/un.h>
-#include <poll.h>
 
 typedef enum {
        lxc_msg_state,

diff --git a/src/lxc/namespace.c b/src/lxc/namespace.c
index 5b26d64ba29a13f3d5bd5ffbca5267364f20f24a..8df173ff9ea546c14e9808642a8876d09591db44 100644 (file)
--- a/src/lxc/namespace.c
+++ b/src/lxc/namespace.c
@@ -21,18 +21,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
 #include <signal.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "log.h"
 #include "namespace.h"
 #include "utils.h"

diff --git a/src/lxc/namespace.h b/src/lxc/namespace.h
index 1341af0e62ab0b99dd97f5e476f51243a80bef67..8de2d51860cd88b608a259477ffd52b0c063d5ec 100644 (file)
--- a/src/lxc/namespace.h
+++ b/src/lxc/namespace.h
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include "config.h"
-
 #ifndef CLONE_PARENT_SETTID
 #define CLONE_PARENT_SETTID 0x00100000
 #endif

diff --git a/src/lxc/network.c b/src/lxc/network.c
index 62fdd9097320ad48b9f54df75d76f4dca286877c..20ab21ae644037f6b4d5a895800acaea60e6e55a 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -21,16 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <arpa/inet.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
@@ -38,17 +35,22 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
+#include "../include/netns_ifaddrs.h"
 #include "af_unix.h"
 #include "conf.h"
 #include "config.h"
-#include <../include/netns_ifaddrs.h>
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/lxc/network.h b/src/lxc/network.h
index 38f7c8d5f56951b55076bc4e6691468ffcf08d49..ef1b41b897a3f76a3a82175851c3152e92782df3 100644 (file)
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -23,12 +23,12 @@
 #ifndef __LXC_NETWORK_H
 #define __LXC_NETWORK_H
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <arpa/inet.h>
 #include <linux/types.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 #include "list.h"
 

diff --git a/src/lxc/nl.c b/src/lxc/nl.c
index 06a72fb88b3969bb03a30d4ca34f008a1e9bda43..eb4535a7315527cdc41289dce35c6b7ec4a2cc89 100644 (file)
--- a/src/lxc/nl.c
+++ b/src/lxc/nl.c
@@ -21,18 +21,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
-#include <sys/socket.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
-#include <stdlib.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <time.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "log.h"
 #include "nl.h"
 

diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 9a8e877606ec4920160d465d318ddef63705cb59..bef9bee471d630111247033ca0d13ba8e655cd4f 100644 (file)
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -33,10 +33,14 @@
  * See COPYING file for details.
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/unistd.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -44,22 +48,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <linux/unistd.h>
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#include "config.h"
+#include "macro.h"
+#include "utils.h"
 
 #define PAM_SM_SESSION
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
 
-#include "macro.h"
-#include "utils.h"
-
 #ifndef HAVE_STRLCPY
 #include "include/strlcpy.h"
 #endif

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 3ae96f3078830c303d1aede939d85600bd6fcd7e..fcc174a7710ea7f6894a02696cc45978772b614b 100644 (file)
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -21,18 +21,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
-#include <stdio.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <dirent.h>
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 
+#include "config.h"
+#include "log.h"
 #include "parse.h"
 #include "utils.h"
-#include "log.h"
 
 lxc_log_define(parse, lxc);
 

diff --git a/src/lxc/ringbuf.c b/src/lxc/ringbuf.c
index 7aa2e6310e3ae4965ca0d98100af6c4d5cc1ad5f..1d5cfe9161e6be512a11414899796d80e85cbe26 100644 (file)
--- a/src/lxc/ringbuf.c
+++ b/src/lxc/ringbuf.c
@@ -17,7 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS
 #include <errno.h>
 #include <inttypes.h>
@@ -25,9 +27,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mman.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "ringbuf.h"
 #include "utils.h"
 

diff --git a/src/lxc/rtnl.c b/src/lxc/rtnl.c
index bb1f7d52114c5a782bfd01b407ed25d44b7f58de..2f237a73e37796f9bb70ec48363cede6ab3f4a55 100644 (file)
--- a/src/lxc/rtnl.c
+++ b/src/lxc/rtnl.c
@@ -20,15 +20,20 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include <string.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <stdlib.h>
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
-#include <unistd.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "nl.h"
 #include "rtnl.h"
 

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 7d5addb9e5ec76b97137a3927d62f4809514405d..1e14be17e95fd9b930c9f3967c4c7849a63ad390 100644 (file)
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <seccomp.h>
 #include <stdio.h>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 0629e90c4271a7eea0c0b1b1a08b7538f3bde1ec..3d4efb890a01e06471fb335b71cc5406b518e3c2 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -23,9 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <alloca.h>
 #include <dirent.h>
 #include <errno.h>
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/param.h>
@@ -48,10 +47,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-
-#if HAVE_LIBCAP
-#include <sys/capability.h>
-#endif
+#include <unistd.h>
 
 #include "af_unix.h"
 #include "caps.h"
@@ -59,12 +55,13 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
+#include "config.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "file_utils.h"
 #include "list.h"
-#include "lsm/lsm.h"
 #include "log.h"
+#include "lsm/lsm.h"
 #include "lxccontainer.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
@@ -80,6 +77,10 @@
 #include "terminal.h"
 #include "utils.h"
 
+#if HAVE_LIBCAP
+#include <sys/capability.h>
+#endif
+
 #ifndef HAVE_STRLCPY
 #include "include/strlcpy.h"
 #endif

diff --git a/src/lxc/start.h b/src/lxc/start.h
index bcb852e8ba5f3e91162ed6352c367d51ae228dff..df987dcb9e3561b7531543182bce029b483423f5 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -32,7 +32,6 @@
 #include <sys/un.h>
 
 #include "conf.h"
-#include "config.h"
 #include "namespace.h"
 #include "state.h"
 

diff --git a/src/lxc/state.c b/src/lxc/state.c
index d8a8dab2599abc6885d27da8f783aa7c2ba2251e..b3e6f83f8b2209d7aa015a8113e7bc316a71408a 100644 (file)
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -21,19 +21,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <unistd.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "cgroup.h"
 #include "commands.h"

diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index 3204ffcd52e7a58ad06b14b8708aed61087fce36..af7f6eb1e54f6f3ae0c6700223932bf92cfac9b7 100644 (file)
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -29,15 +31,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
-#include "log.h"
 #include "btrfs.h"
+#include "config.h"
+#include "log.h"
 #include "rsync.h"
 #include "storage.h"
 #include "utils.h"

diff --git a/src/lxc/storage/btrfs.h b/src/lxc/storage/btrfs.h
index 4d02a7842bf0e6198f709e8cdca9d2ea42edb78b..930799ade86c661277a4f995a410afb9a1b6a4b8 100644 (file)
--- a/src/lxc/storage/btrfs.h
+++ b/src/lxc/storage/btrfs.h
@@ -24,11 +24,10 @@
 #ifndef __LXC_BTRFS_H
 #define __LXC_BTRFS_H
 
-#define _GNU_SOURCE
+#include <byteswap.h>
 #include <linux/types.h> /* __le64, __l32 ... */
 #include <stdbool.h>
 #include <stdint.h>
-#include <byteswap.h>
 
 #ifndef BTRFS_SUPER_MAGIC
 #  define BTRFS_SUPER_MAGIC       0x9123683E

diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
index 2414f533e23a4742b17492ce084580597d0e88f4..79b646961fae77763e8d16f46616d48c31ec5130 100644 (file)
--- a/src/lxc/storage/dir.c
+++ b/src/lxc/storage/dir.c
@@ -21,10 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdint.h>
 #include <string.h>
 
+#include "config.h"
 #include "log.h"
 #include "storage.h"
 #include "utils.h"

diff --git a/src/lxc/storage/dir.h b/src/lxc/storage/dir.h
index 6858e0040539d386d803330fcb9861c51b11c014..7a3f734725cdc2c97032fb2261f95be32517fe2b 100644 (file)
--- a/src/lxc/storage/dir.h
+++ b/src/lxc/storage/dir.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_DIR_H
 #define __LXC_DIR_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/loop.c b/src/lxc/storage/loop.c
index fa538654880d2f1ea2432ab7b89ab85d95cfae26..8ea40e088f7eac26df3775e61f2756ede9ea735c 100644 (file)
--- a/src/lxc/storage/loop.c
+++ b/src/lxc/storage/loop.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS
 #include <dirent.h>
 #include <errno.h>
@@ -30,10 +32,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "log.h"
 #include "loop.h"
 #include "storage.h"

diff --git a/src/lxc/storage/loop.h b/src/lxc/storage/loop.h
index a8b1a41854071b8ed41816caec64de8e8696a0a5..92945e178514a6b37c910adcf343abd1485f0f01 100644 (file)
--- a/src/lxc/storage/loop.h
+++ b/src/lxc/storage/loop.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_LOOP_H
 #define __LXC_LOOP_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/lvm.c b/src/lxc/storage/lvm.c
index 2d4f12d7ab02e902f322bc39ff125e3f35e4f480..8bb16175db4611f9ddb616584de83c14280be0e9 100644 (file)
--- a/src/lxc/storage/lvm.c
+++ b/src/lxc/storage/lvm.c
@@ -21,16 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/sysmacros.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "log.h"

diff --git a/src/lxc/storage/lvm.h b/src/lxc/storage/lvm.h
index a86387b07cb0cb092542dc8c41a101005055ced3..a54859f74d611d1789e8ffbe6cdf4f17a341c049 100644 (file)
--- a/src/lxc/storage/lvm.h
+++ b/src/lxc/storage/lvm.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_LVM_H
 #define __LXC_LVM_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/nbd.c b/src/lxc/storage/nbd.c
index 4c3ff51efae4afe4586ba294e5c53383bba4d8d5..cc2289426c332b3237a1e7a7cc16f071b725c6e0 100644 (file)
--- a/src/lxc/storage/nbd.c
+++ b/src/lxc/storage/nbd.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -31,6 +33,7 @@
 #include <sys/prctl.h>
 #include <sys/wait.h>
 
+#include "config.h"
 #include "log.h"
 #include "nbd.h"
 #include "storage.h"

diff --git a/src/lxc/storage/nbd.h b/src/lxc/storage/nbd.h
index bd23359476902a6a993fde8f6082fbd6b08033b0..49c08ff54bfa54fe2aae74ef1340a8d69632b3cb 100644 (file)
--- a/src/lxc/storage/nbd.h
+++ b/src/lxc/storage/nbd.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_NBD_H
 #define __LXC_NBD_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
index f47ccc39bfe652f7e216965e0684139a59463437..a95c6b7e6eaa01da068269be776c6ca81dc33e0e 100644 (file)
--- a/src/lxc/storage/overlay.c
+++ b/src/lxc/storage/overlay.c
@@ -21,13 +21,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "conf.h"
+#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lxccontainer.h"

diff --git a/src/lxc/storage/rbd.c b/src/lxc/storage/rbd.c
index 10ad892a06203bace03f836fbdf40118a2969d6d..daeb76e708920d04b28b13e39d8d1edcf041f493 100644 (file)
--- a/src/lxc/storage/rbd.c
+++ b/src/lxc/storage/rbd.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <inttypes.h>  /* Required for PRIu64 to work. */
 #include <stdint.h>
@@ -29,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
 #include "log.h"
 #include "storage.h"
 #include "storage_utils.h"

diff --git a/src/lxc/storage/rbd.h b/src/lxc/storage/rbd.h
index 9e6e57c3a45167a36fcddd47ba0bc9921cc052fe..a449e72e9e99fdf367794c3b97c2e266835d7a30 100644 (file)
--- a/src/lxc/storage/rbd.h
+++ b/src/lxc/storage/rbd.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_RDB_H
 #define __LXC_RDB_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/lxc/storage/rsync.c b/src/lxc/storage/rsync.c
index 39d09e98d920e00eaef15f6ca71b415647731f02..e3ade30a0d7f083094cf48a5da3848e9ae5a718d 100644 (file)
--- a/src/lxc/storage/rsync.c
+++ b/src/lxc/storage/rsync.c
@@ -21,17 +21,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <grp.h>
 #include <sched.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/mount.h>
+#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 fca81a724150e1a2c421509737eb166c14e188ec..f0a13d6fb75f0562db6ff91abaec5974fcc11799 100644 (file)
--- a/src/lxc/storage/rsync.h
+++ b/src/lxc/storage/rsync.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_RSYNC_H
 #define __LXC_RSYNC_H
 
-#define _GNU_SOURCE
 #include <stdio.h>
 
 struct rsync_data {

diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index 3e64a4a62f178a915615111776cc87e7aea38058..3a1053ea23c8ef792a5f00fed9914e15c179aa50 100644 (file)
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -32,12 +34,12 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include "btrfs.h"
 #include "conf.h"
@@ -49,8 +51,8 @@
 #include "lvm.h"
 #include "lxc.h"
 #include "lxclock.h"
-#include "nbd.h"
 #include "namespace.h"
+#include "nbd.h"
 #include "overlay.h"
 #include "parse.h"
 #include "rbd.h"

diff --git a/src/lxc/storage/storage.h b/src/lxc/storage/storage.h
index fb3b54293902f46b03f5e8c25c02321d4c9cc68e..5486c2855eda21d817dc9c4c2d3be7c675b9ef1d 100644 (file)
--- a/src/lxc/storage/storage.h
+++ b/src/lxc/storage/storage.h
@@ -24,7 +24,6 @@
 #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 da1ed7fcc0afe9ec0a897bf4163fac358b4cef3e..36a62a11e92c2ae277d3afb9fa3a2c9bcc037835 100644 (file)
--- a/src/lxc/storage/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -33,13 +35,14 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #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 905233a245b0c9557c1212ae44cd8cdd63ce3afe..7fc1dcdeeacb39c3641af1cb217543a97f575b07 100644 (file)
--- a/src/lxc/storage/storage_utils.h
+++ b/src/lxc/storage/storage_utils.h
@@ -24,10 +24,9 @@
 #ifndef __LXC_STORAGE_UTILS_H
 #define __LXC_STORAGE_UTILS_H
 
-#include "config.h"
-#include <stdio.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #include "conf.h"
 

diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
index 5ee81575ecb97381b48bd06abe1ac51653b2d65c..a948755db558aaa506afaa5fedbd9f0d2197f6bf 100644 (file)
--- a/src/lxc/storage/zfs.c
+++ b/src/lxc/storage/zfs.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>

diff --git a/src/lxc/storage/zfs.h b/src/lxc/storage/zfs.h
index abfc0129eb7feb0a6493f09a79933cd854dea84f..78f729ef236180d5471842e8289f3aee2ba08acb 100644 (file)
--- a/src/lxc/storage/zfs.h
+++ b/src/lxc/storage/zfs.h
@@ -24,7 +24,6 @@
 #ifndef __LXC_ZFS_H
 #define __LXC_ZFS_H
 
-#define _GNU_SOURCE
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/lxc/string_utils.c b/src/lxc/string_utils.c
index fb5cb54e7b8722099d36489a6733b2ab54b0967e..fb46109b923be944bd4cdd12439ce9809ccae5d8 100644 (file)
--- a/src/lxc/string_utils.c
+++ b/src/lxc/string_utils.c
@@ -17,8 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <ctype.h>
 #include <dirent.h>
@@ -32,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/param.h>
@@ -40,7 +40,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "macro.h"

diff --git a/src/lxc/sync.c b/src/lxc/sync.c
index 27365456531c0b45afaed92191af9017808b34d6..2d2bb6f13c4e18b85944a1c05a51a2b137a3345a 100644 (file)
--- a/src/lxc/sync.c
+++ b/src/lxc/sync.c
@@ -21,16 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "sync.h"
+#include "config.h"
 #include "log.h"
 #include "start.h"
+#include "sync.h"
 #include "utils.h"
 
 lxc_log_define(sync, lxc);

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index b7220a030d189d2e64f0e32a29fd99335ee9baf8..03bd8983b3de5cde1782fea17147d263b220b402 100644 (file)
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <lxc/lxccontainer.h>

diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index 7077b02dd69fcaa619803639c6903b447e0e5281..d1d404a6f1f9df53777537c8e8e2fbc650a4e179 100644 (file)
--- a/src/lxc/terminal.h
+++ b/src/lxc/terminal.h
@@ -24,8 +24,6 @@
 #ifndef __LXC_TERMINAL_H
 #define __LXC_TERMINAL_H
 
-#include "config.h"
-
 #include <signal.h>
 #include <stdio.h>
 

diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c
index b47df0ecb1ed133190136578f15153ac5a3b4bb3..99b3462070a1caa7be3e854c04fa2f56ed09c856 100644 (file)
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -22,24 +22,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 #include <lxc/version.h>
 
 #include "arguments.h"
 #include "compiler.h"
-#include "namespace.h"
+#include "config.h"
 #include "initutils.h"
+#include "namespace.h"
 
 static int build_shortopts(const struct option *a_options, char *a_shortopts,
                           size_t a_size)

diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
index 43b3a86e2447066aa83c3ca4e62d5bda1010994e..810050ad2a33f06b39cad92274729294eb68a826 100644 (file)
--- a/src/lxc/tools/arguments.h
+++ b/src/lxc/tools/arguments.h
@@ -28,8 +28,9 @@
 #include <getopt.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/types.h>
 #include <sys/param.h>
+#include <sys/types.h>
+
 #include <lxc/lxccontainer.h>
 
 struct lxc_arguments;

diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index 551f9f39621e0cdd4b1e73b903b510f3a5357924..3de0d7747f3392dcd40bd87b2ef0107b328a03ec 100644 (file)
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -21,24 +21,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <termios.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
 #include "attach.h"
 #include "caps.h"
+#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c
index e2702f6e926fecebb9a52c1e387a1441d52a8232..1209897ec81ba99b882c43efc1f0a2864867e20e 100644 (file)
--- a/src/lxc/tools/lxc_autostart.c
+++ b/src/lxc/tools/lxc_autostart.c
@@ -18,7 +18,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,6 +29,7 @@
 #include <lxc/lxccontainer.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 069da365fb23716d594cf828d907e93c293edcbc..eb9bf7d666c9ac16303044eeb405bd3bc083f6df 100644 (file)
--- a/src/lxc/tools/lxc_cgroup.c
+++ b/src/lxc/tools/lxc_cgroup.c
@@ -21,17 +21,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 de6cc945339d13ecc61e322f48601a90b2db3e69..107a737b085e2564d24de1ff5ec94ffcc41b85c8 100644 (file)
--- a/src/lxc/tools/lxc_checkpoint.c
+++ b/src/lxc/tools/lxc_checkpoint.c
@@ -16,17 +16,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 c71a3109ba79d7c504c888d842aaf5f1528ebfe7..f94de40cc50e76f34bec23f5fbf6dbf3732f3edf 100644 (file)
--- a/src/lxc/tools/lxc_config.c
+++ b/src/lxc/tools/lxc_config.c
@@ -18,11 +18,16 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdio.h>
 #include <string.h>
 
 #include <lxc/lxccontainer.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 c1f99069dd36c72cf8306b6cb16761dcd844e76d..fff5d5b8452cb7c643164fee9781e36ca2d7d7e3 100644 (file)
--- a/src/lxc/tools/lxc_console.c
+++ b/src/lxc/tools/lxc_console.c
@@ -21,24 +21,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <poll.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 2d608013428c4edb2607704fe726ece978180444..b9e647e5cbe60634673e43b3e4f62015f1732d41 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -16,7 +16,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -26,15 +28,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 ae72f929e99f4024a1699f24a4f7a0b7e5a4f48d..819f7d4a08372a426e2bf7ab698198c0f62f5536 100644 (file)
--- a/src/lxc/tools/lxc_create.c
+++ b/src/lxc/tools/lxc_create.c
@@ -17,18 +17,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
+#include "config.h"
 #include "log.h"
 #include "storage_utils.h"
 #include "utils.h"

diff --git a/src/lxc/tools/lxc_destroy.c b/src/lxc/tools/lxc_destroy.c
index 7e7809893d27c7e54143e683a0cca1b39d240372..6669300d512378f179d851e77d929cf8e71d9a98 100644 (file)
--- a/src/lxc/tools/lxc_destroy.c
+++ b/src/lxc/tools/lxc_destroy.c
@@ -17,18 +17,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
+#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_device.c b/src/lxc/tools/lxc_device.c
index 1d0c4041508af45e2ceffbac02f4dc1a4fdb3e6c..05e64effed752264f7e6e35e3afe12cbe1e2b73f 100644 (file)
--- a/src/lxc/tools/lxc_device.c
+++ b/src/lxc/tools/lxc_device.c
@@ -19,18 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
-#include "arguments.h"
 #include "../../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 8e69f7244865391370d67c2455878bbb175ccfac..09d20e7bb3c9fb2822aa7a3fd987b8c6460d1105 100644 (file)
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@ -21,22 +21,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #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 16b4064d87417cdd823fbfe5516163790e48499c..d99acc17548b2f05111be58c557b5434e667939d 100644 (file)
--- a/src/lxc/tools/lxc_freeze.c
+++ b/src/lxc/tools/lxc_freeze.c
@@ -21,17 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 16369b720193f5396309b00094912b6db24fbe1d..07303366c0adbd198a3296a704d722ce6fe1b0c5 100644 (file)
--- a/src/lxc/tools/lxc_info.c
+++ b/src/lxc/tools/lxc_info.c
@@ -21,19 +21,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 32278d498655926d82cfd07872cf46c0489f7fe0..7f1510f936e8015077e87acbdb0ee3e81cd625ae 100644 (file)
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -16,7 +16,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <dirent.h>
 #include <getopt.h>
 #include <limits.h>
@@ -26,16 +28,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <termios.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <termios.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
+#include "config.h"
 #include "log.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c
index 86a77c3afe38cf3a0d4e2d41745b6e3bcedc59b7..ed4d3efd18bad874e7fc936aeaa1ecb34ab795b3 100644 (file)
--- a/src/lxc/tools/lxc_monitor.c
+++ b/src/lxc/tools/lxc_monitor.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS
 #include <dirent.h>
 #include <errno.h>
@@ -34,18 +36,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #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 f943bdd1c4d163df8519c4645160fd9cc81be9cf..26830162fd32f1739db23069d0905a6761b9f769 100644 (file)
--- a/src/lxc/tools/lxc_snapshot.c
+++ b/src/lxc/tools/lxc_snapshot.c
@@ -17,19 +17,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <ctype.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
+#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_snapshot, lxc);

diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index 1815991e44ec922e6e1f0947d7d7e7bea5e140f2..74d2e06eaba1790033b4934eb20b54f4c13142e0 100644 (file)
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -21,28 +21,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <net/if.h>
+#include <netinet/in.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
 #include "caps.h"
+#include "config.h"
 #include "confile.h"
 #include "log.h"
 

diff --git a/src/lxc/tools/lxc_stop.c b/src/lxc/tools/lxc_stop.c
index 76c759d0cfe078d429599485f47f8d8ba51a9211..1267fd11e7ff3b323c80eb46c89c1bdfb4c81680 100644 (file)
--- a/src/lxc/tools/lxc_stop.c
+++ b/src/lxc/tools/lxc_stop.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,6 +33,7 @@
 #include <lxc/lxccontainer.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 0ffc65e6f54cc2320d820e1ed639c3144c8e0e64..9fad3a433528255068f45ace374acc19ddf557cd 100644 (file)
--- a/src/lxc/tools/lxc_top.c
+++ b/src/lxc/tools/lxc_top.c
@@ -21,7 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <errno.h>
 #include <inttypes.h>
@@ -31,15 +33,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
-#include <unistd.h>
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <termios.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 7a9972c4c296cbaf008717d794e44ec075ca5fe4..3df8dc04d4b4b983852c58b67be155240ec69ecf 100644 (file)
--- a/src/lxc/tools/lxc_unfreeze.c
+++ b/src/lxc/tools/lxc_unfreeze.c
@@ -21,16 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.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 a7458fa4132517e57d73e82a9f874c8e4028f283..3aa703e5fc8610428dd5a1c509310cb6c4d1443d 100644 (file)
--- a/src/lxc/tools/lxc_unshare.c
+++ b/src/lxc/tools/lxc_unshare.c
@@ -21,26 +21,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <libgen.h>
+#include <netinet/in.h>
 #include <pwd.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netinet/in.h>
-#include <unistd.h>
 #include <sys/eventfd.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #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 6c3c0708533add036f147730b9325ce73960cfff..fa249593e1b0539b883c3f9fc9a02ab8f227789a 100644 (file)
--- a/src/lxc/tools/lxc_wait.c
+++ b/src/lxc/tools/lxc_wait.c
@@ -21,18 +21,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <libgen.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
+#include "config.h"
 #include "log.h"
 
 lxc_log_define(lxc_wait, lxc);

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 9b6f0a617a3d50d04af7159e05f9cb5a7f3b1509..52b75b3f958a61abab03997185e60438301852a3 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -21,8 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <ctype.h>
 #include <dirent.h>
@@ -36,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/param.h>
@@ -44,7 +44,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "namespace.h"

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index 0f121e673282e2553d9bdf37e757525e59f39dfb..a26366d1cd906e94a7c38ea3527fae8a31d02e52 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -26,28 +26,26 @@
 /* Properly support loop devices on 32bit systems. */
 #define _FILE_OFFSET_BITS 64
 
-#include "config.h"
-
 #include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
 #include <linux/loop.h>
 #include <linux/types.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
-
-#ifdef HAVE_LINUX_MEMFD_H
-#include <linux/memfd.h>
-#endif
+#include <unistd.h>
 
 #include "file_utils.h"
 #include "initutils.h"
 #include "macro.h"
 #include "string_utils.h"
 
+#ifdef HAVE_LINUX_MEMFD_H
+#include <linux/memfd.h>
+#endif
+
 /* returns 1 on success, 0 if there were any failures */
 extern int lxc_rmdir_onedev(const char *path, const char *exclude);
 extern int get_u16(unsigned short *val, const char *arg, int base);