Remove all uses of G_CONST_RETURN

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

diff --git a/gmodule/gmodule-beos.c b/gmodule/gmodule-beos.c
index 159d4f8..c54eed9 100644 (file)
--- a/gmodule/gmodule-beos.c
+++ b/gmodule/gmodule-beos.c
@@ -5,16 +5,16 @@
  * Copyright (C) 1999 Richard Offer and Shawn T. Amundson (amundson@gtk.org)
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
@@ -23,6 +23,7 @@
 /* 
  * MT safe
  */
+#include "config.h"
 
 #include <be/kernel/image.h> /* image (aka DSO) handling functions... */
 
@@ -48,6 +49,9 @@
  * different image_id's. While this means that we don't have to worry about 
  * reference counts, it could lead to problems in the future....
  * richard.
+ *
+ * load_add_on() apparently does not support lazy or local binding.  Need
+ * to confirm that the actual behavior is non-lazy/local.  --ds
  */
 
 #include <Errors.h>
@@ -56,7 +60,8 @@
 /* --- functions --- */
 static gpointer
 _g_module_open (const gchar *file_name,
-               gboolean     bind_lazy)
+               gboolean     bind_lazy,
+               gboolean     bind_local)
 {
   image_id handle;
   
@@ -190,10 +195,10 @@ _g_module_build_path (const gchar *directory,
       if (strncmp (module_name, "lib", 3) == 0)
        return g_strconcat (directory, "/", module_name, NULL);
       else
-       return g_strconcat (directory, "/lib", module_name, ".so", NULL);
+       return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL);
     }
   else if (strncmp (module_name, "lib", 3) == 0)
     return g_strdup (module_name);
   else
-    return g_strconcat ("lib", module_name, ".so", NULL);
+    return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL);
 }