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-ethernet.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/devices/nm-device-ethernet.h') diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h index 2d284822..3ce6f0ca 100644 --- a/src/devices/nm-device-ethernet.h +++ b/src/devices/nm-device-ethernet.h @@ -24,8 +24,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ()) #define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet)) #define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) @@ -33,15 +31,20 @@ G_BEGIN_DECLS #define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET)) #define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) -#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address" #define NM_DEVICE_ETHERNET_SPEED "speed" #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels" -typedef NMDevice NMDeviceEthernet; -typedef NMDeviceClass NMDeviceEthernetClass; +struct _NMDeviceEthernetPrivate; -GType nm_device_ethernet_get_type (void); +typedef struct { + NMDevice parent; + struct _NMDeviceEthernetPrivate *_priv; +} NMDeviceEthernet; -G_END_DECLS +typedef struct { + NMDeviceClass parent_class; +} NMDeviceEthernetClass; + +GType nm_device_ethernet_get_type (void); -#endif /* NM_DEVICE_ETHERNET_H */ +#endif /* __NETWORKMANAGER_DEVICE_ETHERNET_H__ */ -- cgit 1.3.0-6-gf8a5