summaryrefslogtreecommitdiff
path: root/libnm/nm-object.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-02-12 14:44:52 +0100
committerThomas Haller <thaller@redhat.com>2016-02-12 15:36:01 +0100
commit2c2d9d2e4cca422a53968cdcb6def420dd77961e (patch)
tree3c05e45abdd2e3442f4b18123a1818b03c999871 /libnm/nm-object.c
parent97be12b6625e738856814403195b60f7ebc13bfe (diff)
downloadNetworkManager-2c2d9d2e4cca422a53968cdcb6def420dd77961e.tar.gz
build: cleanup default includes
- "gsystem-local-alloc.h" and <gio/gio.h> are already included via "nm-default.h". No need to include them separately. - include "nm-macros-internal.h" via "nm-default.h" and drop all explict includes. - in the modified files, ensure that we always include "config.h" and "nm-default.h" first. As second, include the header file for the current source file (if applicable). Then follow external includes and finally internal nm includes. - include nm headers inside source code files with quotes - internal header files don't need to include default headers. They can savely assume that "nm-default.h" is already included and with it glib, nm-glib.h, nm-macros-internal.h, etc.
Diffstat (limited to 'libnm/nm-object.c')
-rw-r--r--libnm/nm-object.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 143931f1b1..42c6476e94 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -21,19 +21,20 @@
#include "config.h"
+#include "nm-default.h"
+#include "nm-object.h"
+
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <nm-utils.h>
-#include "nm-default.h"
+
+#include "nm-utils.h"
#include "nm-dbus-interface.h"
-#include "nm-object.h"
#include "nm-object-cache.h"
#include "nm-object-private.h"
#include "nm-dbus-helpers.h"
#include "nm-client.h"
#include "nm-core-internal.h"
-#include "nm-macros-internal.h"
static gboolean debug = FALSE;
#define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); }