summaryrefslogtreecommitdiff
path: root/src/devices/nm-device-infiniband.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-21 22:09:52 -0400
committerDan Winship <danw@gnome.org>2014-10-28 17:17:17 -0400
commitb108790833e4829586cf42a60a60a783fe535608 (patch)
treed4be5914f03e998efd21b810aa95e0e5171d8c59 /src/devices/nm-device-infiniband.c
parent6eba3aa141bc94fa81e9e20a6bf0e66a86409857 (diff)
downloadNetworkManager-b108790833e4829586cf42a60a60a783fe535608.tar.gz
libnm-core: add nm-core-types.h, remove cross-includes
Add nm-core-types.h, typedefing all of the GObject types in libnm-core; this is needed so that nm-setting.h can reference NMConnection in addition to nm-connection.h referencing NMSetting. Removing the cross-includes from the various headers causes lots of fallout elsewhere. (In particular, nm-utils.h used to include nm-connection.h, which included every setting header, so any file that included nm-utils.h automatically got most of the rest of libnm-core without needing to pay attention to specifics.) Fix this up by including nm-core-internal.h from those files that are now missing includes.
Diffstat (limited to 'src/devices/nm-device-infiniband.c')
-rw-r--r--src/devices/nm-device-infiniband.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 69cdc6715e..e1af899507 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -27,7 +27,6 @@
#include "nm-device-infiniband.h"
#include "nm-logging.h"
-#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-enum-types.h"
@@ -36,6 +35,7 @@
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "nm-device-factory.h"
+#include "nm-core-internal.h"
#include "nm-device-infiniband-glue.h"