Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 3 insertions, 9 deletions

diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h
index dfb8ff78..c193b860 100644
--- a/src/tests/config/nm-test-device.h
+++ b/src/tests/config/nm-test-device.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_TEST_DEVICE_H__
 #define __NETWORKMANAGER_TEST_DEVICE_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_TEST_DEVICE            (nm_test_device_get_type ())
 #define NM_TEST_DEVICE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEST_DEVICE, NMTestDevice))
@@ -30,14 +30,8 @@
 #define NM_IS_TEST_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_TEST_DEVICE))
 #define NM_TEST_DEVICE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_TEST_DEVICE, NMTestDeviceClass))
 
-typedef struct {
-	NMDevice parent;
-
-} NMTestDevice;
-
-typedef struct {
-	NMDeviceClass parent;
-} NMTestDeviceClass;
+typedef struct _NMTestDevice NMTestDevice;
+typedef struct _NMTestDeviceClass NMTestDeviceClass;
 
 GType nm_test_device_get_type (void);