Add build/win32/setup.py to distribution

[platform/upstream/glib.git] / gmodule / gmodule-ar.c

diff --git a/gmodule/gmodule-ar.c b/gmodule/gmodule-ar.c
index 5176794..8bc847d 100644 (file)
--- a/gmodule/gmodule-ar.c
+++ b/gmodule/gmodule-ar.c
@@ -24,7 +24,11 @@
 /* because we are compatible with archive format only since AIX 4.3 */
 
 #define __AR_BIG__
+
+#include "config.h"
+
 #include <ar.h>
+#include <stdlib.h>
 
 #include <dlfcn.h>
 
@@ -97,7 +101,8 @@ exit:
 
 static gpointer
 _g_module_open (const gchar *file_name,
-               gboolean     bind_lazy)
+               gboolean     bind_lazy,
+               gboolean     bind_local)
 {
   gpointer handle;
   gchar* member;
@@ -105,18 +110,19 @@ _g_module_open (const gchar *file_name,
 
   /* extract name of first member of archive */
 
-  member = _g_module_get_member(file_name);
+  member = _g_module_get_member (file_name);
   if (member != NULL)
     {
-      full_name = g_strconcat(file_name, "(", member, ")", NULL);
-      g_free(member);
+      full_name = g_strconcat (file_name, "(", member, ")", NULL);
+      g_free (member);
     }
   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)
     g_module_set_error (fetch_dlerror (TRUE));