From cb362e6fbce34fae99c0d924676c3c0e5f7a012f Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Sat, 29 Aug 2020 16:55:06 +0200 Subject: [PATCH] gstreamer: plugin: Prefix glib:: with $crate:: in gst_plugin_define Crates using gst_plugin_define might not (need to) import `glib` directly into their scope; use the one imported in `gstreamer`s root to make this macro more portable. Besides, `glib` is prefixed with `$crate::` just below. --- gstreamer/src/subclass/plugin_1_12.rs | 2 +- gstreamer/src/subclass/plugin_1_14.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gstreamer/src/subclass/plugin_1_12.rs b/gstreamer/src/subclass/plugin_1_12.rs index e9a2d7301..95ca24eff 100644 --- a/gstreamer/src/subclass/plugin_1_12.rs +++ b/gstreamer/src/subclass/plugin_1_12.rs @@ -45,7 +45,7 @@ macro_rules! gst_plugin_define( _gst_reserved: [0 as $crate::glib_sys::gpointer; 4], }); - pub fn plugin_register_static() -> Result<(), glib::BoolError> { + pub fn plugin_register_static() -> Result<(), $crate::glib::BoolError> { unsafe { $crate::glib::glib_result_from_gboolean!( $crate::gst_sys::gst_plugin_register_static( diff --git a/gstreamer/src/subclass/plugin_1_14.rs b/gstreamer/src/subclass/plugin_1_14.rs index 4bede8d6d..3aa95186f 100644 --- a/gstreamer/src/subclass/plugin_1_14.rs +++ b/gstreamer/src/subclass/plugin_1_14.rs @@ -43,7 +43,7 @@ macro_rules! gst_plugin_define( _gst_reserved: [0 as $crate::glib_sys::gpointer; 4], }); - pub fn plugin_register_static() -> Result<(), glib::BoolError> { + pub fn plugin_register_static() -> Result<(), $crate::glib::BoolError> { unsafe { $crate::glib::glib_result_from_gboolean!( $crate::gst_sys::gst_plugin_register_static(