Revert again, this time without post-commit reindent hooks to put back the indentatio...

[platform/upstream/gstreamer.git] / libs / gst / control / unitconvert.h

diff --git a/libs/gst/control/unitconvert.h b/libs/gst/control/unitconvert.h
index f116eff..1f23ade 100644 (file)
--- a/libs/gst/control/unitconvert.h
+++ b/libs/gst/control/unitconvert.h
@@ -24,9 +24,7 @@
 
 #include <gst/gstobject.h>
 
-#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))
@@ -56,7 +54,9 @@ struct _GstUnitConvertClass {
        /* signal callbacks */
 };
 
-GstUnitConvert* gst_unitconv_new ();
+GType gst_unitconv_get_type (void);
+
+GstUnitConvert* gst_unitconv_new (void);
 void _gst_unitconv_initialize (void);
 
 gboolean gst_unitconv_set_convert_units(GstUnitConvert *unitconv, gchar *from_unit_named, gchar *to_unit_named);
@@ -74,8 +74,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__ */