From af69a0f2961a0f8ede84676e831b6c2d0ea721f3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 3 Nov 2011 14:26:12 +0100
Subject: [PATCH] nettime: clean up header

---
 libs/gst/net/gstnettimeprovider.c | 6 +++---
 libs/gst/net/gstnettimeprovider.h | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c
index c1b4cac1cb..cb16f433fb 100644
--- a/libs/gst/net/gstnettimeprovider.c
+++ b/libs/gst/net/gstnettimeprovider.c
@@ -70,7 +70,7 @@ GST_DEBUG_CATEGORY_STATIC (ntp_debug);
 #define DEFAULT_ADDRESS         "0.0.0.0"
 #define DEFAULT_PORT            5637
 
-#define IS_ACTIVE(self) (g_atomic_int_get (&((self)->active.active)))
+#define IS_ACTIVE(self) (g_atomic_int_get (&((self)->active)))
 
 #ifdef G_OS_WIN32
 #define setsockopt(sock, sol_flags, reuse_flags, ru, sizeofru) setsockopt (sock, sol_flags, reuse_flags, (char *)ru, sizeofru)
@@ -177,7 +177,7 @@ gst_net_time_provider_init (GstNetTimeProvider * self)
   self->priv->sock.fd = -1;
   self->address = g_strdup (DEFAULT_ADDRESS);
   self->thread = NULL;
-  self->active.active = TRUE;
+  self->active = TRUE;
 }
 
 static void
@@ -308,7 +308,7 @@ gst_net_time_provider_set_property (GObject * object, guint prop_id,
           (GstObject *) g_value_get_object (value));
       break;
     case PROP_ACTIVE:
-      g_atomic_int_set (&self->active.active, g_value_get_boolean (value));
+      g_atomic_int_set (&self->active, g_value_get_boolean (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/libs/gst/net/gstnettimeprovider.h b/libs/gst/net/gstnettimeprovider.h
index c9609e16ab..c145bff35d 100644
--- a/libs/gst/net/gstnettimeprovider.h
+++ b/libs/gst/net/gstnettimeprovider.h
@@ -83,16 +83,13 @@ struct _GstNetTimeProvider {
 
   GstClock *clock;
 
-  union {
-    gpointer _gst_reserved1;
-    /* has to be a gint, we use atomic ops here */
-    gint active;
-  } active;
+  /* has to be a gint, we use atomic ops here */
+  gint active;
 
   /*< private >*/
   GstNetTimeProviderPrivate *priv;
 
-  gpointer _gst_reserved[GST_PADDING - 2];
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstNetTimeProviderClass {