Merge tag 'upstream/1.0.0' into experimental

Upstream version 1.0.0

1 files changed, 4 insertions, 12 deletions

diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h
index 348ed2f9..24f15437 100644
--- a/src/devices/nm-device-macvlan.h
+++ b/src/devices/nm-device-macvlan.h
@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_MACVLAN_H
-#define NM_DEVICE_MACVLAN_H
+#ifndef __NETWORKMANAGER_DEVICE_MACVLAN_H__
+#define __NETWORKMANAGER_DEVICE_MACVLAN_H__
 
 #include <glib-object.h>
 
@@ -38,19 +38,11 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MACVLAN_MODE       "mode"
 #define NM_DEVICE_MACVLAN_NO_PROMISC "no-promisc"
 
-typedef struct {
-	NMDeviceGeneric parent;
-} NMDeviceMacvlan;
-
-typedef struct {
-	NMDeviceGenericClass parent;
-
-} NMDeviceMacvlanClass;
+typedef NMDeviceGeneric NMDeviceMacvlan;
+typedef NMDeviceGenericClass NMDeviceMacvlanClass;
 
 GType nm_device_macvlan_get_type (void);
 
-NMDevice *nm_device_macvlan_new (NMPlatformLink *platform_device);
-
 G_END_DECLS
 
 #endif	/* NM_DEVICE_MACVLAN_H */