From 33bd5179c312d90f0665aed4d4f5524881cecc87 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Wed, 8 Oct 2008 10:39:24 +0000
Subject: [PATCH] gst/gstghostpad.*: Unbreak -good build, private is a reserved
 c++ keyword.

Original commit message from CVS:
* gst/gstghostpad.c:
* gst/gstghostpad.h:
Unbreak -good build, private is a reserved c++ keyword.
---
 ChangeLog         | 6 ++++++
 gst/gstghostpad.c | 4 ++--
 gst/gstghostpad.h | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ab0ce6329..d2ada5088c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/gstghostpad.c:
+	* gst/gstghostpad.h:
+	Unbreak -good build, private is a reserved c++ keyword.
+
 2008-10-08  Andy Wingo  <wingo@pobox.com>
 
 	* gst/gstghostpad.h (GST_GHOST_PAD_CAST):
diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c
index 80d9a0e085..2d6e496ddf 100644
--- a/gst/gstghostpad.c
+++ b/gst/gstghostpad.c
@@ -53,7 +53,7 @@
 #define GST_CAT_DEFAULT GST_CAT_PADS
 
 #define GST_PROXY_PAD_CAST(obj)         ((GstProxyPad *)obj)
-#define GST_PROXY_PAD_PRIVATE(obj)      (GST_PROXY_PAD_CAST (obj)->private)
+#define GST_PROXY_PAD_PRIVATE(obj)      (GST_PROXY_PAD_CAST (obj)->priv)
 #define GST_PROXY_PAD_TARGET(pad)       (GST_PROXY_PAD_PRIVATE (pad)->target)
 #define GST_PROXY_PAD_INTERNAL(pad)     (GST_PROXY_PAD_PRIVATE (pad)->internal)
 #define GST_PROXY_GET_LOCK(pad) (GST_PROXY_PAD_PRIVATE (pad)->proxy_lock)
@@ -485,7 +485,7 @@ gst_proxy_pad_save_thyself (GstObject * object, xmlNodePtr parent)
  */
 
 
-#define GST_GHOST_PAD_PRIVATE(obj)	(GST_GHOST_PAD_CAST (obj)->private)
+#define GST_GHOST_PAD_PRIVATE(obj)	(GST_GHOST_PAD_CAST (obj)->priv)
 
 struct _GstGhostPadPrivate
 {
diff --git a/gst/gstghostpad.h b/gst/gstghostpad.h
index 1f31ab04d3..db78f77fe6 100644
--- a/gst/gstghostpad.h
+++ b/gst/gstghostpad.h
@@ -46,7 +46,7 @@ struct _GstProxyPad
   GstPad pad;
 
   /*< private > */
-  GstProxyPadPrivate *private;
+  GstProxyPadPrivate *priv;
 };
 
 struct _GstProxyPadClass
@@ -81,7 +81,7 @@ struct _GstGhostPad
   GstProxyPad pad;
 
   /*< private > */
-  GstGhostPadPrivate *private;
+  GstGhostPadPrivate *priv;
 };
 
 struct _GstGhostPadClass