summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-03-07 14:09:36 +0100
committerSebastian Dröge <sebastian@centricular.com>2014-03-07 14:10:33 +0100
commit1b800edcbbabc44ede7b4e57749384e37f38f80a (patch)
tree1b437cae703bb34e910cc9e1266d09b9160394fc /data
parentc222914a8eaa6124771263241d9baf5be897a00e (diff)
Load static GIO modules directly instead of going through dlopen() on the executable
This requires updating iOS projects, but before this change the static GIO modules couldn't be loaded at all anyway so it shouldn't affect any existing project. https://bugzilla.gnome.org/show_bug.cgi?id=725202
Diffstat (limited to 'data')
-rw-r--r--data/ndk-build/gstreamer_android-1.0.c.in10
-rw-r--r--data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h10
2 files changed, 20 insertions, 0 deletions
diff --git a/data/ndk-build/gstreamer_android-1.0.c.in b/data/ndk-build/gstreamer_android-1.0.c.in
index c9d0bf6a..8cf79774 100644
--- a/data/ndk-build/gstreamer_android-1.0.c.in
+++ b/data/ndk-build/gstreamer_android-1.0.c.in
@@ -5,6 +5,16 @@
static GstClockTime _priv_gst_info_start_time;
+#ifndef G_IO_MODULE_DECLARE
+#define G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+#endif
+
+#ifndef G_IO_MODULE_LOAD
+#define G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+#endif
+
/* Declaration of static plugins */
@PLUGINS_DECLARATION@
diff --git a/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h b/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h
index 85f63729..db80cf99 100644
--- a/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h
+++ b/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h
@@ -5,6 +5,16 @@
G_BEGIN_DECLS
+#ifndef G_IO_MODULE_DECLARE
+#define G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+#endif
+
+#ifndef G_IO_MODULE_LOAD
+#define G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+#endif
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/