gplugin/gplugin

Stop using G_MODULE_SUFFIX

7 months ago, Gary Kramlich
2c0c4aa117f6
Parents ab8f907594f5
Children c5e39c391d9b
Stop using G_MODULE_SUFFIX

G_MODULE_SUFFIX was deprecated in GLib 2.76.0 and we were only using to to
define what file extensions the native loader should use.

Testing Done:
Compiled.

Reviewed at https://reviews.imfreedom.org/r/2784/
1 files changed, 8 insertions(+), 6 deletions(-)
  • +8 -6
    gplugin/gplugin-native-loader.c
    • --- a/gplugin/gplugin-native-loader.c Mon Nov 06 21:00:46 2023 -0600
    +++ b/gplugin/gplugin-native-loader.c Mon Nov 06 23:51:44 2023 -0600
    @@ -79,14 +79,16 @@
    static GSList *
    gplugin_native_loader_supported_extensions(G_GNUC_UNUSED GPluginLoader *l)
    {
    - GSList *exts = g_slist_append(NULL, G_MODULE_SUFFIX);
    + GSList *exts = NULL;
    -#if defined(__APPLE__) || defined(__MACH__)
    - /* G_MODULE_SUFFIX only requests `.so` on not windows, and both .so and
    - * .dylib are used on macos, so add dylib if we're on macos.
    - * See: https://gitlab.gnome.org/GNOME/glib/issues/1413
    - */
    +#if defined(_WIN32)
    + exts = g_slist_append(exts, "dll");
    +#elif defined(__APPLE__) || defined(__MACH__)
    + /* Both .so and .dylib are used on macOS. */
    + exts = g_slist_append(exts, "so");
    exts = g_slist_append(exts, "dylib");
    +#else
    + exts = g_slist_append(exts, "so");
    #endif
    return exts;