From 6a0b4950ad613ca072af3e90040d1bbcb5834361 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 10 May 2015 09:16:31 +0200
Subject: platform: add priv pointer to NMLinuxPlatform

---
 src/platform/nm-linux-platform.c | 20 +++++++++++++++-----
 src/platform/nm-linux-platform.h |  4 ++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 150ad20ac3..eca9bcd882 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -393,7 +393,9 @@ typedef struct {
 	gpointer user_data;
 } DelayedActionData;
 
-typedef struct {
+typedef struct _NMLinuxPlatformPrivate NMLinuxPlatformPrivate;
+
+struct _NMLinuxPlatformPrivate {
 	struct nl_sock *nlh;
 	struct nl_sock *nlh_event;
 	NMPCache *cache;
@@ -409,9 +411,15 @@ typedef struct {
 	} delayed_action;
 
 	GHashTable *wifi_data;
-} NMLinuxPlatformPrivate;
+};
+
+static inline NMLinuxPlatformPrivate *
+NM_LINUX_PLATFORM_GET_PRIVATE (const void *self)
+{
+	nm_assert (NM_IS_LINUX_PLATFORM (self));
 
-#define NM_LINUX_PLATFORM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_LINUX_PLATFORM, NMLinuxPlatformPrivate))
+	return ((NMLinuxPlatform *) self)->priv;
+}
 
 G_DEFINE_TYPE (NMLinuxPlatform, nm_linux_platform, NM_TYPE_PLATFORM)
 
@@ -4540,9 +4548,11 @@ handle_udev_event (GUdevClient *client,
 /******************************************************************/
 
 static void
-nm_linux_platform_init (NMLinuxPlatform *platform)
+nm_linux_platform_init (NMLinuxPlatform *self)
 {
-	NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
+	NMLinuxPlatformPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_LINUX_PLATFORM, NMLinuxPlatformPrivate);
+
+	self->priv = priv;
 
 	priv->cache = nmp_cache_new ();
 	priv->delayed_action.list = g_array_new (FALSE, FALSE, sizeof (DelayedActionData));
diff --git a/src/platform/nm-linux-platform.h b/src/platform/nm-linux-platform.h
index 6f2c199391..a9e2cd82f9 100644
--- a/src/platform/nm-linux-platform.h
+++ b/src/platform/nm-linux-platform.h
@@ -32,8 +32,12 @@
 
 /******************************************************************/
 
+struct _NMLinuxPlatformPrivate;
+
 typedef struct {
 	NMPlatform parent;
+
+	struct _NMLinuxPlatformPrivate *priv;
 } NMLinuxPlatform;
 
 typedef struct {
-- 
cgit v1.2.1