mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstghostpad.*: Unbreak -good build, private is a reserved c++ keyword.

Browse source 
Original commit message from CVS:
* gst/gstghostpad.c:
* gst/gstghostpad.h:
Unbreak -good build, private is a reserved c++ keyword.
This commit is contained in:
Wim Taymans 2008-10-08 10:39:24 +00:00
parent b731374c49
commit 33bd5179c3
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2008-10-08 Andy Wingo <wingo@pobox.com>
* gst/gstghostpad.h (GST_GHOST_PAD_CAST): * gst/gstghostpad.h (GST_GHOST_PAD_CAST):

4
gst/gstghostpad.c
View file

@ -53,7 +53,7 @@
#define GST_CAT_DEFAULT GST_CAT_PADS #define GST_CAT_DEFAULT GST_CAT_PADS
#define GST_PROXY_PAD_CAST(obj) ((GstProxyPad *)obj) #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_TARGET(pad) (GST_PROXY_PAD_PRIVATE (pad)->target)
#define GST_PROXY_PAD_INTERNAL(pad) (GST_PROXY_PAD_PRIVATE (pad)->internal) #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) #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 struct _GstGhostPadPrivate
{ {

4
gst/gstghostpad.h
View file

@ -46,7 +46,7 @@ struct _GstProxyPad
GstPad pad; GstPad pad;
/*< private > */ /*< private > */
GstProxyPadPrivate *private; GstProxyPadPrivate *priv;
}; };
struct _GstProxyPadClass struct _GstProxyPadClass
@ -81,7 +81,7 @@ struct _GstGhostPad
GstProxyPad pad; GstProxyPad pad;
/*< private > */ /*< private > */
GstGhostPadPrivate *private; GstGhostPadPrivate *priv;
}; };
struct _GstGhostPadClass struct _GstGhostPadClass