From 31efa36756b2005cfff780ba4538be8edb5e28b0 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Wed, 30 Oct 2002 09:17:34 +0000 Subject: [PATCH] use G_{BEGIN,END}_DECLS Original commit message from CVS: use G_{BEGIN,END}_DECLS --- examples/plugins/example.h | 11 ++--------- gst/autoplug/gstspider.h | 9 ++------- gst/autoplug/gstspideridentity.h | 12 ++---------- gst/autoplug/gststaticautoplug.h | 9 ++------- gst/autoplug/gststaticautoplugrender.h | 9 ++------- gst/elements/gstaggregator.h | 10 ++-------- gst/elements/gstfakesink.h | 11 ++--------- gst/elements/gstfakesrc.h | 11 ++--------- gst/elements/gstfdsink.h | 12 ++---------- gst/elements/gstfdsrc.h | 11 ++--------- gst/elements/gstfilesink.h | 12 ++---------- gst/elements/gstfilesrc.h | 10 ++-------- gst/elements/gstidentity.h | 12 ++---------- gst/elements/gstmd5sink.h | 11 ++--------- gst/elements/gstmultidisksrc.h | 8 ++------ gst/elements/gstmultifilesrc.h | 8 ++------ gst/elements/gstpipefilter.h | 11 ++--------- gst/elements/gststatistics.h | 12 ++---------- gst/elements/gsttee.h | 10 ++-------- gst/registries/gstxmlregistry.h | 9 ++------- libs/gst/control/control.h | 10 +++------- libs/gst/control/dparam.h | 8 ++------ libs/gst/control/dparam_smooth.h | 8 ++------ libs/gst/control/dparamcommon.h | 8 ++------ libs/gst/control/dparammanager.h | 8 ++------ libs/gst/control/dplinearinterp.h | 9 ++------- libs/gst/control/unitconvert.h | 8 ++------ plugins/elements/gstaggregator.h | 10 ++-------- plugins/elements/gstfakesink.h | 11 ++--------- plugins/elements/gstfakesrc.h | 11 ++--------- plugins/elements/gstfdsink.h | 12 ++---------- plugins/elements/gstfdsrc.h | 11 ++--------- plugins/elements/gstfilesink.h | 12 ++---------- plugins/elements/gstfilesrc.h | 10 ++-------- plugins/elements/gstidentity.h | 12 ++---------- plugins/elements/gstmd5sink.h | 11 ++--------- plugins/elements/gstmultidisksrc.h | 8 ++------ plugins/elements/gstmultifilesrc.h | 8 ++------ plugins/elements/gstpipefilter.h | 11 ++--------- plugins/elements/gststatistics.h | 12 ++---------- plugins/elements/gsttee.h | 10 ++-------- tests/bufspeed/gstbuffer.h | 10 ++-------- tests/old/examples/plugins/example.h | 11 ++--------- 43 files changed, 87 insertions(+), 350 deletions(-) diff --git a/examples/plugins/example.h b/examples/plugins/example.h index b397e1e027..cbb7b28ce7 100644 --- a/examples/plugins/example.h +++ b/examples/plugins/example.h @@ -23,10 +23,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS /* This is the definition of the element's object structure. */ typedef struct _GstExample GstExample; @@ -85,10 +82,6 @@ struct _GstExampleClass { */ GType gst_example_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_EXAMPLE_H__ */ diff --git a/gst/autoplug/gstspider.h b/gst/autoplug/gstspider.h index b214a108e8..c255a6682d 100644 --- a/gst/autoplug/gstspider.h +++ b/gst/autoplug/gstspider.h @@ -26,9 +26,7 @@ #include #include "gstspideridentity.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GstElementDetails gst_spider_details; @@ -90,9 +88,6 @@ GType gst_spider_get_type (void); void gst_spider_identity_plug (GstSpiderIdentity *ident); void gst_spider_identity_unplug (GstSpiderIdentity *ident); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_SPIDER_H__ */ diff --git a/gst/autoplug/gstspideridentity.h b/gst/autoplug/gstspideridentity.h index 3c5139bfb9..ebe7a7bc06 100644 --- a/gst/autoplug/gstspideridentity.h +++ b/gst/autoplug/gstspideridentity.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_spider_identity_details; @@ -81,10 +77,6 @@ GstSpiderIdentity* gst_spider_identity_new_sink (gchar *name); GstSpiderIdentity* gst_spider_identity_new_src (gchar *name); GstPad* gst_spider_identity_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *name); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_SPIDER_IDENTITY_H__ */ diff --git a/gst/autoplug/gststaticautoplug.h b/gst/autoplug/gststaticautoplug.h index 11511d4005..92fc3a19ca 100644 --- a/gst/autoplug/gststaticautoplug.h +++ b/gst/autoplug/gststaticautoplug.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_STATIC_AUTOPLUG \ (gst_static_autoplug_get_type()) @@ -55,10 +53,7 @@ struct _GstStaticAutoplugClass { GType gst_static_autoplug_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_STATIC_AUTOPLUG_H__ */ diff --git a/gst/autoplug/gststaticautoplugrender.h b/gst/autoplug/gststaticautoplugrender.h index 6af32d401a..bf44b13ade 100644 --- a/gst/autoplug/gststaticautoplugrender.h +++ b/gst/autoplug/gststaticautoplugrender.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_STATIC_AUTOPLUG_RENDER \ (gst_static_autoplug_render_get_type()) @@ -55,10 +53,7 @@ struct _GstStaticAutoplugRenderClass { GType gst_static_autoplug_render_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_STATIC_AUTOPLUG_H__ */ diff --git a/gst/elements/gstaggregator.h b/gst/elements/gstaggregator.h index b460eab51e..4dff593f7b 100644 --- a/gst/elements/gstaggregator.h +++ b/gst/elements/gstaggregator.h @@ -26,10 +26,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GstElementDetails gst_aggregator_details; @@ -75,9 +72,6 @@ GType gst_aggregator_get_type (void); gboolean gst_aggregator_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_AGGREGATOR_H__ */ diff --git a/gst/elements/gstfakesink.h b/gst/elements/gstfakesink.h index 6c38ae343b..94a9b2a3b5 100644 --- a/gst/elements/gstfakesink.h +++ b/gst/elements/gstfakesink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fakesink_details; @@ -73,9 +69,6 @@ GType gst_fakesink_get_type(void); gboolean gst_fakesink_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FAKESINK_H__ */ diff --git a/gst/elements/gstfakesrc.h b/gst/elements/gstfakesrc.h index d8026765d1..61c64840ad 100644 --- a/gst/elements/gstfakesrc.h +++ b/gst/elements/gstfakesrc.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fakesrc_details; @@ -125,9 +121,6 @@ GType gst_fakesrc_get_type(void); gboolean gst_fakesrc_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FAKESRC_H__ */ diff --git a/gst/elements/gstfdsink.h b/gst/elements/gstfdsink.h index 8cf98c2c45..2b4f385c2d 100644 --- a/gst/elements/gstfdsink.h +++ b/gst/elements/gstfdsink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fdsink_details; @@ -65,10 +61,6 @@ struct _GstFdSinkClass { GType gst_fdsink_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FDSINK_H__ */ diff --git a/gst/elements/gstfdsrc.h b/gst/elements/gstfdsrc.h index 0fa21551fb..b4abdfd9ef 100644 --- a/gst/elements/gstfdsrc.h +++ b/gst/elements/gstfdsrc.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fdsrc_details; @@ -72,9 +68,6 @@ struct _GstFdSrcClass { GType gst_fdsrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FDSRC_H__ */ diff --git a/gst/elements/gstfilesink.h b/gst/elements/gstfilesink.h index 716da6126a..76ffb815ea 100644 --- a/gst/elements/gstfilesink.h +++ b/gst/elements/gstfilesink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_filesink_details; @@ -78,10 +74,6 @@ struct _GstFileSinkClass { GType gst_filesink_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FILESINK_H__ */ diff --git a/gst/elements/gstfilesrc.h b/gst/elements/gstfilesrc.h index 8a9420e8eb..f40a1e05b8 100644 --- a/gst/elements/gstfilesrc.h +++ b/gst/elements/gstfilesrc.h @@ -28,10 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_FILESRC \ (gst_filesrc_get_type()) @@ -83,9 +80,6 @@ struct _GstFileSrcClass { GType gst_filesrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FILESRC_H__ */ diff --git a/gst/elements/gstidentity.h b/gst/elements/gstidentity.h index a1cd84bfdf..6987404f44 100644 --- a/gst/elements/gstidentity.h +++ b/gst/elements/gstidentity.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_identity_details; @@ -76,10 +72,6 @@ struct _GstIdentityClass { GType gst_identity_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_IDENTITY_H__ */ diff --git a/gst/elements/gstmd5sink.h b/gst/elements/gstmd5sink.h index 7d3377ce5f..a78976d0c6 100644 --- a/gst/elements/gstmd5sink.h +++ b/gst/elements/gstmd5sink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_md5sink_details; @@ -78,9 +74,6 @@ GType gst_md5sink_get_type (void); gboolean gst_md5sink_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_MD5SINK_H__ */ diff --git a/gst/elements/gstmultidisksrc.h b/gst/elements/gstmultidisksrc.h index ba235e8069..3b1a9f49c1 100644 --- a/gst/elements/gstmultidisksrc.h +++ b/gst/elements/gstmultidisksrc.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS GstElementDetails gst_multidisksrc_details; @@ -77,8 +75,6 @@ struct _GstMultiDiskSrcClass { GType gst_multidisksrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_MULTIDISKSRC_H__ */ diff --git a/gst/elements/gstmultifilesrc.h b/gst/elements/gstmultifilesrc.h index ba235e8069..3b1a9f49c1 100644 --- a/gst/elements/gstmultifilesrc.h +++ b/gst/elements/gstmultifilesrc.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS GstElementDetails gst_multidisksrc_details; @@ -77,8 +75,6 @@ struct _GstMultiDiskSrcClass { GType gst_multidisksrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_MULTIDISKSRC_H__ */ diff --git a/gst/elements/gstpipefilter.h b/gst/elements/gstpipefilter.h index 221a914ed5..6d5ea4cc2e 100644 --- a/gst/elements/gstpipefilter.h +++ b/gst/elements/gstpipefilter.h @@ -29,10 +29,7 @@ #include "config.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_pipefilter_details; @@ -82,10 +79,6 @@ struct _GstPipefilterClass { GType gst_pipefilter_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_PIPEFILTER_H__ */ diff --git a/gst/elements/gststatistics.h b/gst/elements/gststatistics.h index 8a4d9fd568..ae0242f0d3 100644 --- a/gst/elements/gststatistics.h +++ b/gst/elements/gststatistics.h @@ -27,11 +27,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_statistics_details; @@ -86,10 +82,6 @@ struct _GstStatisticsClass { GType gst_statistics_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_STATISTICS_H__ */ diff --git a/gst/elements/gsttee.h b/gst/elements/gsttee.h index 4326f15dcd..68b541daf2 100644 --- a/gst/elements/gsttee.h +++ b/gst/elements/gsttee.h @@ -26,10 +26,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GstElementDetails gst_tee_details; @@ -64,9 +61,6 @@ GType gst_tee_get_type (void); gboolean gst_tee_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_TEE_H__ */ diff --git a/gst/registries/gstxmlregistry.h b/gst/registries/gstxmlregistry.h index 9d28dcc788..714d931884 100644 --- a/gst/registries/gstxmlregistry.h +++ b/gst/registries/gstxmlregistry.h @@ -24,9 +24,7 @@ #ifndef __GST_XML_REGISTRY_H__ #define __GST_XML_REGISTRY_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #include @@ -126,10 +124,7 @@ GType gst_xml_registry_get_type (void); GstRegistry* gst_xml_registry_new (const gchar *name, const gchar *location); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_XML_REGISTRY_H__ */ diff --git a/libs/gst/control/control.h b/libs/gst/control/control.h index 5d82056857..048918245a 100644 --- a/libs/gst/control/control.h +++ b/libs/gst/control/control.h @@ -22,20 +22,16 @@ #ifndef __GST_CONTROL_H__ #define __GST_CONTROL_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include #include #include #include #include +G_BEGIN_DECLS + void gst_control_init (int *argc, char **argv[]); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_CONTROL_H__ */ diff --git a/libs/gst/control/dparam.h b/libs/gst/control/dparam.h index 7ea2f914a9..680c30f9c6 100644 --- a/libs/gst/control/dparam.h +++ b/libs/gst/control/dparam.h @@ -26,9 +26,7 @@ #include #include "dparamcommon.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_DPARAM (gst_dparam_get_type ()) #define GST_DPARAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DPARAM,GstDParam)) @@ -102,8 +100,6 @@ void gst_dparam_attach (GstDParam *dparam, GstDParamManager *manager, GParamSpec void gst_dparam_detach (GstDParam *dparam); void gst_dparam_do_update_default (GstDParam *dparam, gint64 timestamp, GValue *value, GstDParamUpdateInfo update_info); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_DPARAM_H__ */ diff --git a/libs/gst/control/dparam_smooth.h b/libs/gst/control/dparam_smooth.h index bcfdbb7571..967e956cf4 100644 --- a/libs/gst/control/dparam_smooth.h +++ b/libs/gst/control/dparam_smooth.h @@ -24,9 +24,7 @@ #include "dparam.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_DPSMOOTH (gst_dpsmooth_get_type ()) #define GST_DPSMOOTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DPSMOOTH,GstDParamSmooth)) @@ -63,8 +61,6 @@ struct _GstDParamSmoothClass { GstDParam* gst_dpsmooth_new (GType type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_DPSMOOTH_H__ */ diff --git a/libs/gst/control/dparamcommon.h b/libs/gst/control/dparamcommon.h index d51c4a75b9..05e1e9fb3d 100644 --- a/libs/gst/control/dparamcommon.h +++ b/libs/gst/control/dparamcommon.h @@ -22,15 +22,11 @@ #ifndef __GST_DPCOMMON_H__ #define __GST_DPCOMMON_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GstDParam GstDParam; typedef struct _GstDParamManager GstDParamManager; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_DPCOMMON_H__ */ diff --git a/libs/gst/control/dparammanager.h b/libs/gst/control/dparammanager.h index 41f0349a9f..ec11631b6d 100644 --- a/libs/gst/control/dparammanager.h +++ b/libs/gst/control/dparammanager.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_DPMAN (gst_dpman_get_type ()) #define GST_DPMAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DPMAN,GstDParamManager)) @@ -180,8 +178,6 @@ void gst_dpman_register_mode (GstDParamManagerClass *klass, GstDPMModeSetupFunction setupfunc, GstDPMModeTeardownFunction teardownfunc); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_DPMAN_H__ */ diff --git a/libs/gst/control/dplinearinterp.h b/libs/gst/control/dplinearinterp.h index ae6d2f9664..3228912406 100644 --- a/libs/gst/control/dplinearinterp.h +++ b/libs/gst/control/dplinearinterp.h @@ -26,10 +26,7 @@ #include #include "dparam.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GST_TYPE_DP_LININT (gst_dp_linint_get_type ()) #define GST_DP_LININT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DP_LININT,GstDParamLinInterp)) @@ -54,8 +51,6 @@ struct _GstDParamLinInterpClass { GType gst_dp_linint_get_type (void); GstDParam* gst_dp_linint_new (GType type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_DP_LININT_H__ */ diff --git a/libs/gst/control/unitconvert.h b/libs/gst/control/unitconvert.h index f116eff3e2..c0836193aa 100644 --- a/libs/gst/control/unitconvert.h +++ b/libs/gst/control/unitconvert.h @@ -24,9 +24,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_UNIT_CONVERT (gst_unitconv_get_type ()) #define GST_UNIT_CONVERT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_UNIT_CONVERT,GstUnitConvert)) @@ -74,8 +72,6 @@ gboolean gst_unitconv_register_unit(const gchar *domain_name, gboolean gst_unitconv_register_convert_func(gchar *from_unit_named, gchar *to_unit_named, GstUnitConvertFunc convert_func); gboolean gst_unitconv_register_convert_property(gchar *unit_name, GParamSpec *convert_prop_spec); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_UNITCONVERT_H__ */ diff --git a/plugins/elements/gstaggregator.h b/plugins/elements/gstaggregator.h index b460eab51e..4dff593f7b 100644 --- a/plugins/elements/gstaggregator.h +++ b/plugins/elements/gstaggregator.h @@ -26,10 +26,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GstElementDetails gst_aggregator_details; @@ -75,9 +72,6 @@ GType gst_aggregator_get_type (void); gboolean gst_aggregator_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_AGGREGATOR_H__ */ diff --git a/plugins/elements/gstfakesink.h b/plugins/elements/gstfakesink.h index 6c38ae343b..94a9b2a3b5 100644 --- a/plugins/elements/gstfakesink.h +++ b/plugins/elements/gstfakesink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fakesink_details; @@ -73,9 +69,6 @@ GType gst_fakesink_get_type(void); gboolean gst_fakesink_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FAKESINK_H__ */ diff --git a/plugins/elements/gstfakesrc.h b/plugins/elements/gstfakesrc.h index d8026765d1..61c64840ad 100644 --- a/plugins/elements/gstfakesrc.h +++ b/plugins/elements/gstfakesrc.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fakesrc_details; @@ -125,9 +121,6 @@ GType gst_fakesrc_get_type(void); gboolean gst_fakesrc_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FAKESRC_H__ */ diff --git a/plugins/elements/gstfdsink.h b/plugins/elements/gstfdsink.h index 8cf98c2c45..2b4f385c2d 100644 --- a/plugins/elements/gstfdsink.h +++ b/plugins/elements/gstfdsink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fdsink_details; @@ -65,10 +61,6 @@ struct _GstFdSinkClass { GType gst_fdsink_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FDSINK_H__ */ diff --git a/plugins/elements/gstfdsrc.h b/plugins/elements/gstfdsrc.h index 0fa21551fb..b4abdfd9ef 100644 --- a/plugins/elements/gstfdsrc.h +++ b/plugins/elements/gstfdsrc.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_fdsrc_details; @@ -72,9 +68,6 @@ struct _GstFdSrcClass { GType gst_fdsrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FDSRC_H__ */ diff --git a/plugins/elements/gstfilesink.h b/plugins/elements/gstfilesink.h index 716da6126a..76ffb815ea 100644 --- a/plugins/elements/gstfilesink.h +++ b/plugins/elements/gstfilesink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_filesink_details; @@ -78,10 +74,6 @@ struct _GstFileSinkClass { GType gst_filesink_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FILESINK_H__ */ diff --git a/plugins/elements/gstfilesrc.h b/plugins/elements/gstfilesrc.h index 8a9420e8eb..f40a1e05b8 100644 --- a/plugins/elements/gstfilesrc.h +++ b/plugins/elements/gstfilesrc.h @@ -28,10 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_FILESRC \ (gst_filesrc_get_type()) @@ -83,9 +80,6 @@ struct _GstFileSrcClass { GType gst_filesrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_FILESRC_H__ */ diff --git a/plugins/elements/gstidentity.h b/plugins/elements/gstidentity.h index a1cd84bfdf..6987404f44 100644 --- a/plugins/elements/gstidentity.h +++ b/plugins/elements/gstidentity.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_identity_details; @@ -76,10 +72,6 @@ struct _GstIdentityClass { GType gst_identity_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_IDENTITY_H__ */ diff --git a/plugins/elements/gstmd5sink.h b/plugins/elements/gstmd5sink.h index 7d3377ce5f..a78976d0c6 100644 --- a/plugins/elements/gstmd5sink.h +++ b/plugins/elements/gstmd5sink.h @@ -28,11 +28,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_md5sink_details; @@ -78,9 +74,6 @@ GType gst_md5sink_get_type (void); gboolean gst_md5sink_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_MD5SINK_H__ */ diff --git a/plugins/elements/gstmultidisksrc.h b/plugins/elements/gstmultidisksrc.h index ba235e8069..3b1a9f49c1 100644 --- a/plugins/elements/gstmultidisksrc.h +++ b/plugins/elements/gstmultidisksrc.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS GstElementDetails gst_multidisksrc_details; @@ -77,8 +75,6 @@ struct _GstMultiDiskSrcClass { GType gst_multidisksrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_MULTIDISKSRC_H__ */ diff --git a/plugins/elements/gstmultifilesrc.h b/plugins/elements/gstmultifilesrc.h index ba235e8069..3b1a9f49c1 100644 --- a/plugins/elements/gstmultifilesrc.h +++ b/plugins/elements/gstmultifilesrc.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS GstElementDetails gst_multidisksrc_details; @@ -77,8 +75,6 @@ struct _GstMultiDiskSrcClass { GType gst_multidisksrc_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_MULTIDISKSRC_H__ */ diff --git a/plugins/elements/gstpipefilter.h b/plugins/elements/gstpipefilter.h index 221a914ed5..6d5ea4cc2e 100644 --- a/plugins/elements/gstpipefilter.h +++ b/plugins/elements/gstpipefilter.h @@ -29,10 +29,7 @@ #include "config.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_pipefilter_details; @@ -82,10 +79,6 @@ struct _GstPipefilterClass { GType gst_pipefilter_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_PIPEFILTER_H__ */ diff --git a/plugins/elements/gststatistics.h b/plugins/elements/gststatistics.h index 8a4d9fd568..ae0242f0d3 100644 --- a/plugins/elements/gststatistics.h +++ b/plugins/elements/gststatistics.h @@ -27,11 +27,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GstElementDetails gst_statistics_details; @@ -86,10 +82,6 @@ struct _GstStatisticsClass { GType gst_statistics_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_STATISTICS_H__ */ diff --git a/plugins/elements/gsttee.h b/plugins/elements/gsttee.h index 4326f15dcd..68b541daf2 100644 --- a/plugins/elements/gsttee.h +++ b/plugins/elements/gsttee.h @@ -26,10 +26,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GstElementDetails gst_tee_details; @@ -64,9 +61,6 @@ GType gst_tee_get_type (void); gboolean gst_tee_factory_init (GstElementFactory *factory); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_TEE_H__ */ diff --git a/tests/bufspeed/gstbuffer.h b/tests/bufspeed/gstbuffer.h index cb1791f3bd..5a766957f0 100644 --- a/tests/bufspeed/gstbuffer.h +++ b/tests/bufspeed/gstbuffer.h @@ -45,10 +45,7 @@ #include #endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GType _gst_buffer_type; @@ -162,9 +159,6 @@ GstBuffer* gst_buffer_append (GstBuffer *buf, GstBuffer *buf2); gboolean gst_buffer_is_span_fast (GstBuffer *buf1, GstBuffer *buf2); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_BUFFER_H__ */ diff --git a/tests/old/examples/plugins/example.h b/tests/old/examples/plugins/example.h index b397e1e027..cbb7b28ce7 100644 --- a/tests/old/examples/plugins/example.h +++ b/tests/old/examples/plugins/example.h @@ -23,10 +23,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS /* This is the definition of the element's object structure. */ typedef struct _GstExample GstExample; @@ -85,10 +82,6 @@ struct _GstExampleClass { */ GType gst_example_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_EXAMPLE_H__ */