mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

features: remove extra G_BEGIN_DECLS/G_END_DECLS

Browse source 
_GST_ELEMENT_REGISTER_DEFINE_BEGIN
_GST_ELEMENT_REGISTER_DEFINE_END was introducing
an extra extern "C" in case of c++ build.

Add missing ";" in GST_ELEMENT_REGISTER_DECLARE

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/757>
This commit is contained in:
Stéphane Cerveau 2021-02-15 09:54:51 +01:00
parent c53ea138c6
commit 3952e19c2a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/gstelement.h
View file

@ -28,7 +28,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* _GST_ELEMENT_REGISTER_DEFINE_BEGIN: (attributes doc.skip=true) * _GST_ELEMENT_REGISTER_DEFINE_BEGIN: (attributes doc.skip=true)
*/ */
@ -37,14 +36,12 @@ G_BEGIN_DECLS \
gboolean G_PASTE (gst_element_register_, element) (GstPlugin * plugin) \ gboolean G_PASTE (gst_element_register_, element) (GstPlugin * plugin) \
{ \ { \
gboolean ret = FALSE; \ gboolean ret = FALSE; \
{\ {
G_END_DECLS
/** /**
* _GST_ELEMENT_REGISTER_DEFINE_END: (attributes doc.skip=true) * _GST_ELEMENT_REGISTER_DEFINE_END: (attributes doc.skip=true)
*/ */
#define _GST_ELEMENT_REGISTER_DEFINE_END(element_name, rank, type) \ #define _GST_ELEMENT_REGISTER_DEFINE_END(element_name, rank, type) \
G_BEGIN_DECLS \
} \ } \
ret |= gst_element_register (plugin, element_name, rank, type); \ ret |= gst_element_register (plugin, element_name, rank, type); \
return ret; \ return ret; \
@ -143,7 +140,7 @@ G_END_DECLS
*/ */
#define GST_ELEMENT_REGISTER_DECLARE(element) \ #define GST_ELEMENT_REGISTER_DECLARE(element) \
G_BEGIN_DECLS \ G_BEGIN_DECLS \
gboolean G_PASTE(gst_element_register_, element) (GstPlugin * plugin) \ gboolean G_PASTE(gst_element_register_, element) (GstPlugin * plugin); \
G_END_DECLS G_END_DECLS
/** /**