luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile on AIX. (#141159, Michael Wilson)

Browse Source 
Tue May 11 23:23:21 2004  Matthias Clasen  <maclas@gmx.de>

	* gmodule-ar.c (_g_module_open): Make it compile on AIX.
	(#141159, Michael Wilson)
This commit is contained in:
Matthias Clasen 2004-05-12 03:31:55 +00:00 committed by Matthias Clasen
parent 185c1de577
commit 52e231144f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gmodule/ChangeLog
View File

@ -1,3 +1,8 @@
Tue May 11 23:23:21 2004 Matthias Clasen <maclas@gmx.de>
* gmodule-ar.c (_g_module_open): Make it compile on AIX.
(#141159, Michael Wilson)
2004-03-31 Tor Lillqvist <tml@iki.fi> 2004-03-31 Tor Lillqvist <tml@iki.fi>
* gmodule-win32.c (_g_module_build_path): On Cygwin, use the "cyg" * gmodule-win32.c (_g_module_build_path): On Cygwin, use the "cyg"

16
gmodule/gmodule-ar.c
View File

@ -97,7 +97,8 @@ exit:
static gpointer static gpointer
_g_module_open (const gchar *file_name, _g_module_open (const gchar *file_name,
gboolean bind_lazy) gboolean bind_lazy,
gboolean bind_local)
{ {
gpointer handle; gpointer handle;
gchar* member; gchar* member;
@ -105,18 +106,19 @@ _g_module_open (const gchar *file_name,
/* extract name of first member of archive */ /* extract name of first member of archive */
member = _g_module_get_member(file_name); member = _g_module_get_member (file_name);
if (member != NULL) if (member != NULL)
{ {
full_name = g_strconcat(file_name, "(", member, ")", NULL); full_name = g_strconcat (file_name, "(", member, ")", NULL);
g_free(member); g_free (member);
} }
else else
full_name = g_strdup(file_name); full_name = g_strdup (file_name);
handle = dlopen (full_name, RTLD_GLOBAL | RTLD_MEMBER | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); handle = dlopen (full_name,
(bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | RTLD_MEMBER | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
g_free(full_name); g_free (full_name);
if (!handle) if (!handle)
g_module_set_error (fetch_dlerror (TRUE)); g_module_set_error (fetch_dlerror (TRUE));