luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-06 13:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail to load modules with suffix .la. (#480122, Andrey Tsyvarev)

Browse Source 
2007-12-22  Matthias Clasen  <mclasen@redhat.com>

        * gmodule.c (g_module_open): Don't fail to load modules
        with suffix .la.  (#480122, Andrey Tsyvarev)



svn path=/branches/glib-2-14/; revision=6273
This commit is contained in:
Matthias Clasen
2008-01-08 01:26:41 +00:00
committed by Matthias Clasen
parent bbf0b57b03
commit 50fb12bd85
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gmodule/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-01-07 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
* gmodule.c (g_module_open): Don't fail to load modules
with suffix .la. (#480122, Andrey Tsyvarev)
2007-11-24 Matthias Clasen <mclasen@redhat.com> 2007-11-24 Matthias Clasen <mclasen@redhat.com>
* === Released 2.14.4 === * === Released 2.14.4 ===

3
gmodule/gmodule.c
View File

@@ -427,9 +427,12 @@ g_module_open (const gchar *file_name,
gchar *real_name = parse_libtool_archive (name); gchar *real_name = parse_libtool_archive (name);
/* real_name might be NULL, but then module error is already set */ /* real_name might be NULL, but then module error is already set */
if (real_name)
{
g_free (name); g_free (name);
name = real_name; name = real_name;
} }
}
if (name) if (name)
handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0, handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0,
(flags & G_MODULE_BIND_LOCAL) != 0); (flags & G_MODULE_BIND_LOCAL) != 0);