diff options
author | Dan Winship <danw@gnome.org> | 2014-07-17 17:06:44 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-07-23 10:56:26 -0400 |
commit | b28f6526c27b920827416315f13ca051bf5a644d (patch) | |
tree | dc8a924222fc59fe15091558f23d02c576dd3a0c /src/nm-types.h | |
parent | b7c7832ae87054bdf4138d0c509a3a31504f69cf (diff) | |
download | NetworkManager-b28f6526c27b920827416315f13ca051bf5a644d.tar.gz |
core: fill in nm-types.h, clean out other headers
Clean up some of the cross-includes between headers (which made it so
that, eg, if you included NetworkManagerUtils.h in a test program, you
would need to build the test with -I$(top_srcdir)/src/platform, and if
you included nm-device.h you'd need $(POLKIT_CFLAGS)) by moving all
GObject struct definitions for src/ and src/settings/ into nm-types.h
(which already existed to solve the NMDevice/NMActRequest circular
references).
Update various .c files to explicitly include the headers they used to
get implicitly, and remove some now-unnecessary -I options from
Makefiles.
Diffstat (limited to 'src/nm-types.h')
-rw-r--r-- | src/nm-types.h | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/nm-types.h b/src/nm-types.h index c558d7ba51..a08d0f0db1 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -21,6 +21,35 @@ #ifndef NM_TYPES_H #define NM_TYPES_H -typedef struct _NMDevice NMDevice; +/* core */ +typedef struct _NMActiveConnection NMActiveConnection; +typedef struct _NMActRequest NMActRequest; +typedef struct _NMAuthSubject NMAuthSubject; +typedef struct _NMConnectionProvider NMConnectionProvider; +typedef struct _NMConnectivity NMConnectivity; +typedef struct _NMDBusManager NMDBusManager; +typedef struct _NMDevice NMDevice; +typedef struct _NMDHCP4Config NMDHCP4Config; +typedef struct _NMDHCP6Config NMDHCP6Config; +typedef struct _NMIP4Config NMIP4Config; +typedef struct _NMIP6Config NMIP6Config; +typedef struct _NMManager NMManager; +typedef struct _NMPolicy NMPolicy; +typedef struct _NMRfkillManager NMRfkillManager; +typedef struct _NMSessionMonitor NMSessionMonitor; +typedef struct _NMSleepMonitor NMSleepMonitor; + +/* platform */ +typedef struct _NMPlatformIP4Address NMPlatformIP4Address; +typedef struct _NMPlatformIP4Route NMPlatformIP4Route; +typedef struct _NMPlatformIP6Address NMPlatformIP6Address; +typedef struct _NMPlatformIP6Route NMPlatformIP6Route; +typedef struct _NMPlatformLink NMPlatformLink; + +/* settings */ +typedef struct _NMAgentManager NMAgentManager; +typedef struct _NMSecretAgent NMSecretAgent; +typedef struct _NMSettings NMSettings; +typedef struct _NMSettingsConnection NMSettingsConnection; #endif /* NM_TYPES_H */ |