diff options
author | Dan Winship <danw@gnome.org> | 2014-10-09 09:12:42 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-10-10 13:10:18 -0400 |
commit | 8c3d6f734b3d53bf55cfb6b5d26ca8b3d748fd1c (patch) | |
tree | 070535639f71170a5df6cf576dcd7c53b2bb6eda /libnm/nm-vpn-connection.h | |
parent | dccaffe143410c9f5379f1d92e2a95d4de2072c0 (diff) | |
download | NetworkManager-8c3d6f734b3d53bf55cfb6b5d26ca8b3d748fd1c.tar.gz |
libnm: add nm-types.h, to avoid include loops
Add nm-types.h defining all the type structs, to avoid future include
loops. Clean up the includes in all of the installed headers.
Diffstat (limited to 'libnm/nm-vpn-connection.h')
-rw-r--r-- | libnm/nm-vpn-connection.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 86a78d2e0b..349de41ea5 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -26,10 +26,8 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <glib.h> -#include <glib-object.h> -#include "nm-active-connection.h" -#include "nm-vpn-dbus-interface.h" +#include <nm-active-connection.h> +#include <nm-vpn-dbus-interface.h> G_BEGIN_DECLS @@ -43,9 +41,9 @@ G_BEGIN_DECLS #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" #define NM_VPN_CONNECTION_BANNER "banner" -typedef struct { +struct _NMVpnConnection { NMActiveConnection parent; -} NMVpnConnection; +}; typedef struct { NMActiveConnectionClass parent; |