Use this to specify that 'configure' depends on acglib.m4.

[platform/upstream/glib.git] / gmodule / testgmodule.c

diff --git a/gmodule/testgmodule.c b/gmodule/testgmodule.c
index 70ebe2d..db21375 100644 (file)
--- a/gmodule/testgmodule.c
+++ b/gmodule/testgmodule.c
@@ -2,23 +2,23 @@
  * Copyright (C) 1998 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/. 
@@ -46,6 +46,7 @@ main (int   arg,
 {
   GModule *module_self, *module_a, *module_b;
   gchar *string;
+  gchar *basename;
   gchar *plugin_a, *plugin_b;
   SimpleFunc f_a, f_b, f_self;
   GModuleFunc gmod_f;
@@ -53,16 +54,16 @@ main (int   arg,
   string = g_get_current_dir ();
   g_print ("testgmodule (%s):\n", string);
 
-#ifdef G_OS_WIN32
+#if (G_MODULE_IMPL == G_MODULE_IMPL_WIN32)
   plugin_a = g_strconcat (string, "\\libgplugin_a.dll", NULL);
   plugin_b = g_strconcat (string, "\\libgplugin_b.dll", NULL);
 #elif (G_MODULE_IMPL == G_MODULE_IMPL_DLD)
   plugin_a = g_strconcat (string, "/.libs/", "libgplugin_a.sl", NULL);
   plugin_b = g_strconcat (string, "/.libs/", "libgplugin_b.sl", NULL);
-#else /* G_MODULE_IMPL != G_MODULE_IMPL_DLD && !G_OS_WIN32 */
+#else /* neither DLD nor WIN32 */
   plugin_a = g_strconcat (string, "/.libs/", "libgplugin_a.so", NULL);
   plugin_b = g_strconcat (string, "/.libs/", "libgplugin_b.so", NULL);
-#endif /* G_OS_WIN32 */
+#endif
   g_free (string);
 
   /* module handles
@@ -76,7 +77,9 @@ main (int   arg,
     }
   g_print ("check that not yet bound symbols in shared libraries of main module are retrievable:\n");
   string = "g_module_close";
-  g_print ("retrive symbol `%s' from \"%s\":\n", string, g_basename (g_module_name (module_self)));
+  basename = g_path_get_basename (g_module_name (module_self));
+  g_print ("retrive symbol `%s' from \"%s\":\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_self, string, (gpointer) &f_self))
     {
       g_print ("error: %s\n", g_module_error ());
@@ -101,14 +104,18 @@ main (int   arg,
   /* get plugin specific symbols and call them
    */
   string = "gplugin_a_func";
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_a)));
+  basename = g_path_get_basename (g_module_name (module_a));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_a, string, (gpointer) &f_a))
     {
       g_print ("error: %s\n", g_module_error ());
       return 1;
     }
   string = "gplugin_b_func";
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_b)));
+  basename = g_path_get_basename (g_module_name (module_b));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_b, string, (gpointer) &f_b))
     {
       g_print ("error: %s\n", g_module_error ());
@@ -122,19 +129,25 @@ main (int   arg,
   /* get and call globally clashing functions
    */
   string = "g_clash_func";
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_self)));
+  basename = g_path_get_basename (g_module_name (module_self));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_self, string, (gpointer) &f_self))
     {
       g_print ("error: %s\n", g_module_error ());
       return 1;
     }
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_a)));
+  basename = g_path_get_basename (g_module_name (module_a));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_a, string, (gpointer) &f_a))
     {
       g_print ("error: %s\n", g_module_error ());
       return 1;
     }
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_b)));
+  basename = g_path_get_basename (g_module_name (module_b));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_b, string, (gpointer) &f_b))
     {
       g_print ("error: %s\n", g_module_error ());
@@ -150,17 +163,23 @@ main (int   arg,
   /* get and call clashing plugin functions
    */
   string = "gplugin_clash_func";
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_self)));
+  basename = g_path_get_basename (g_module_name (module_self));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_self, string, (gpointer) &f_self))
     f_self = NULL;
   g_print ("retrived function `%s' from self: %p\n", string, f_self);
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_a)));
+  basename = g_path_get_basename (g_module_name (module_a));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_a, string, (gpointer) &f_a))
     {
       g_print ("error: %s\n", g_module_error ());
       return 1;
     }
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_b)));
+  basename = g_path_get_basename (g_module_name (module_b));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_b, string, (gpointer) &f_b))
     {
       g_print ("error: %s\n", g_module_error ());
@@ -176,7 +195,9 @@ main (int   arg,
   /* call gmodule function form A
    */
   string = "gplugin_a_module_func";
-  g_print ("retrive symbol `%s' from \"%s\"\n", string, g_basename (g_module_name (module_a)));
+  basename = g_path_get_basename (g_module_name (module_a));
+  g_print ("retrive symbol `%s' from \"%s\"\n", string, basename);
+  g_free (basename);
   if (!g_module_symbol (module_a, string, (gpointer) &gmod_f))
     {
       g_print ("error: %s\n", g_module_error ());