diff options
author | Dan Winship <danw@gnome.org> | 2014-10-21 22:09:52 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-10-28 17:17:17 -0400 |
commit | b108790833e4829586cf42a60a60a783fe535608 (patch) | |
tree | d4be5914f03e998efd21b810aa95e0e5171d8c59 /libnm-core/nm-setting-gsm.h | |
parent | 6eba3aa141bc94fa81e9e20a6bf0e66a86409857 (diff) | |
download | NetworkManager-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 'libnm-core/nm-setting-gsm.h')
-rw-r--r-- | libnm-core/nm-setting-gsm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h index 21e3c92b6e..907567381a 100644 --- a/libnm-core/nm-setting-gsm.h +++ b/libnm-core/nm-setting-gsm.h @@ -50,9 +50,9 @@ G_BEGIN_DECLS #define NM_SETTING_GSM_PIN_FLAGS "pin-flags" #define NM_SETTING_GSM_HOME_ONLY "home-only" -typedef struct { +struct _NMSettingGsm { NMSetting parent; -} NMSettingGsm; +}; typedef struct { NMSettingClass parent; |