From b108790833e4829586cf42a60a60a783fe535608 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 21 Oct 2014 22:09:52 -0400 Subject: 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. --- libnm-core/nm-setting-infiniband.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libnm-core/nm-setting-infiniband.h') diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h index 35a576b3bd..c5ad418b22 100644 --- a/libnm-core/nm-setting-infiniband.h +++ b/libnm-core/nm-setting-infiniband.h @@ -45,9 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_INFINIBAND_P_KEY "p-key" #define NM_SETTING_INFINIBAND_PARENT "parent" -typedef struct { +struct _NMSettingInfiniband { NMSetting parent; -} NMSettingInfiniband; +}; typedef struct { NMSettingClass parent; -- cgit v1.2.1