applied patch from Andreas Persenius <ndap@swipnet.se> that updates the

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

diff --git a/gmodule/gmodule-os2.c b/gmodule/gmodule-os2.c
index 7cfa720..49d7351 100644 (file)
--- a/gmodule/gmodule-os2.c
+++ b/gmodule/gmodule-os2.c
@@ -1,24 +1,24 @@
 /* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998 Tim Janik
+ * Copyright (C) 1998, 2000 Tim Janik
  *
  * 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.
  */
 
 /*
- * Modified by the GLib Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GLib at ftp://ftp.gtk.org/pub/gtk/. 
@@ -36,12 +36,8 @@
 /* dlerror() is not implemented on all systems
  */
 #ifndef        G_MODULE_HAVE_DLERROR
-#  ifdef __NetBSD__
-#    define dlerror()  g_strerror (errno)
-#  else /* !__NetBSD__ */
 /* could we rely on errno's state here? */
-#    define dlerror()  "unknown dl-error"
-#  endif /* !__NetBSD__ */
+#  define dlerror()    "unknown dl-error"
 #endif /* G_MODULE_HAVE_DLERROR */
 
 /* some flags are missing on some systems, so we provide
@@ -92,15 +88,16 @@ _g_module_self (void)
    * are required on some systems.
    */
   
-/* XXX, not supported */
+  /* XXX, not supported */
   handle = NULL;
+  g_module_set_error ("module handle for self not supported");
   
   return handle;
 }
 
 static void
-_g_module_close (gpointer        handle,
-                gboolean         is_unref)
+_g_module_close (gpointer handle,
+                gboolean is_unref)
 {
   /* are there any systems out there that have dlopen()/dlclose()
    * without a reference count implementation?
@@ -109,14 +106,14 @@ _g_module_close (gpointer   handle,
   
   if (is_unref)
     {
-/* XXX, no return code */
+      /* XXX, no return code */
       dlclose (handle);
     }
 }
 
 static gpointer
-_g_module_symbol (gpointer       handle,
-                 const gchar    *symbol_name)
+_g_module_symbol (gpointer     handle,
+                 const gchar *symbol_name)
 {
   gpointer p;