mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 02:03:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

deprecation-guards: fixup for commit 9ff4ec3104

Browse source 
Remove the deprecation guards for GST_PLUGIN_DEFINE_STATIC again (even though it
is deprecated) as we use it in the tests. Remove "_" for intlinkfunc.
This commit is contained in:
Stefan Kost 2011-05-20 15:48:09 +03:00
parent 1d57e46dbd
commit 01d8d7d718
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstpad.h
View file

@ -712,7 +712,7 @@ struct _GstPad {
/* internal links */ /* internal links */
#ifndef GST_DISABLE_DEPRECATED #ifndef GST_DISABLE_DEPRECATED
GstPadIntLinkFunction _intlinkfunc; GstPadIntLinkFunction intlinkfunc;
#else #else
gpointer intlinkfunc; gpointer intlinkfunc;
#endif #endif

2
gst/gstplugin.h
View file

@ -298,7 +298,6 @@ G_END_DECLS
/* We don't have deprecation guards here on purpose, it's enough to have /* We don't have deprecation guards here on purpose, it's enough to have
* deprecation guards around _gst_plugin_register_static(), and will result in * deprecation guards around _gst_plugin_register_static(), and will result in
* much better error messages when compiling with -DGST_DISABLE_DEPRECATED */ * much better error messages when compiling with -DGST_DISABLE_DEPRECATED */
#ifndef GST_DISABLE_DEPRECATED
#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) \ #define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) \
static void GST_GNUC_CONSTRUCTOR \ static void GST_GNUC_CONSTRUCTOR \
_gst_plugin_static_init__ ##init (void) \ _gst_plugin_static_init__ ##init (void) \
@ -319,7 +318,6 @@ _gst_plugin_static_init__ ##init (void) \
}; \ }; \
_gst_plugin_register_static (&plugin_desc_); \ _gst_plugin_register_static (&plugin_desc_); \
} }
#endif
/** /**
* GST_LICENSE_UNKNOWN: * GST_LICENSE_UNKNOWN: