From 7514efc2f38c9ace4557d4e69d68e7d380389030 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Aug 2016 02:18:32 +0200 Subject: Imported Upstream version 1.4.0 --- src/devices/nm-device-veth.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/devices/nm-device-veth.h') diff --git a/src/devices/nm-device-veth.h b/src/devices/nm-device-veth.h index c7b8ec3a..53ccf925 100644 --- a/src/devices/nm-device-veth.h +++ b/src/devices/nm-device-veth.h @@ -23,8 +23,6 @@ #include "nm-device-ethernet.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_VETH (nm_device_veth_get_type ()) #define NM_DEVICE_VETH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_VETH, NMDeviceVeth)) #define NM_DEVICE_VETH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_VETH, NMDeviceVethClass)) @@ -34,11 +32,9 @@ G_BEGIN_DECLS #define NM_DEVICE_VETH_PEER "peer" -typedef NMDeviceEthernet NMDeviceVeth; -typedef NMDeviceEthernetClass NMDeviceVethClass; +typedef struct _NMDeviceVeth NMDeviceVeth; +typedef struct _NMDeviceVethClass NMDeviceVethClass; GType nm_device_veth_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_VETH_H */ +#endif /* __NETWORKMANAGER_DEVICE_VETH_H__ */ -- cgit 1.3.0-6-gf8a5