deprecation-guards: fixup for commit 9ff4ec3104d2510b8f379ff38c671682ff795e33

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.

diff --git a/gst/gstpad.h b/gst/gstpad.h
index f2711aa..2b42f39 100644 (file)
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -712,7 +712,7 @@ struct _GstPad {
 
   /* internal links */
 #ifndef GST_DISABLE_DEPRECATED
-  GstPadIntLinkFunction                 _intlinkfunc;
+  GstPadIntLinkFunction                 intlinkfunc;
 #else
   gpointer intlinkfunc;
 #endif

diff --git a/gst/gstplugin.h b/gst/gstplugin.h
index 3964cd2..c4f9c44 100644 (file)
--- a/gst/gstplugin.h
+++ b/gst/gstplugin.h
@@ -298,7 +298,6 @@ G_END_DECLS
 /* 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
  * 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)  \
 static void GST_GNUC_CONSTRUCTOR                       \
 _gst_plugin_static_init__ ##init (void)                        \
@@ -319,7 +318,6 @@ _gst_plugin_static_init__ ##init (void)                     \
   };                                                   \
   _gst_plugin_register_static (&plugin_desc_);         \
 }
-#endif
 
 /**
  * GST_LICENSE_UNKNOWN: