diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-03-10 09:56:42 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-03-10 10:00:19 +0100 |
| commit | 84e425a7616d32b5fcc70cd881546c096c0ce832 (patch) | |
| tree | 53ec968add21e89b1ed75e8140b1bdea95d4424e /data/xcode | |
| parent | 1ff5e6ee4d896dbdcfb09397b35a908d4ba77663 (diff) | |
gio-modules: Rename from G_IO_MODULE_DECLARE to GST_G_IO_MODULE_DECLARE
Prevents future potential conflicts with GIO and we can always define
our own macros in a way that works with whatever GIO decides to do for
static modules.
Diffstat (limited to 'data/xcode')
| -rw-r--r-- | data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.h | 8 | ||||
| -rw-r--r-- | data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.m | 4 |
2 files changed, 4 insertions, 8 deletions
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 db80cf99..57a9b982 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,15 +5,11 @@ G_BEGIN_DECLS -#ifndef G_IO_MODULE_DECLARE -#define G_IO_MODULE_DECLARE(name) \ +#define GST_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) \ +#define GST_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 diff --git a/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.m b/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.m index 1077eb8f..a97f6d54 100644 --- a/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.m +++ b/data/xcode/templates/ios/GStreamer Base.xctemplate/gst_ios_init.m @@ -4,7 +4,7 @@ #if defined(GST_IOS_GIO_MODULE_GNUTLS) #include <gio/gio.h> - G_IO_MODULE_DECLARE(gnutls); + GST_G_IO_MODULE_DECLARE(gnutls); #endif void @@ -40,7 +40,7 @@ gst_ios_init (void) @GST_IOS_PLUGINS_REGISTER@ #if defined(GST_IOS_GIO_MODULE_GNUTLS) - G_IO_MODULE_LOAD(gnutls); + GST_G_IO_MODULE_LOAD(gnutls); #endif /* Lower the ranks of filesrc and giosrc so iosavassetsrc is |