Use G_MODULE_SUFFIX rather than a hardcoded ".so". (#72803)

Sat Mar  2 14:46:17 2002  Owen Taylor  <otaylor@redhat.com>

        * gmodule-beos.c (_g_module_build_path) * gmodule-dyld.c (_g_module_build_path)
          gmodule-dl.c (_g_module_build_path): Use G_MODULE_SUFFIX rather than
        a hardcoded ".so". (#72803)

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index dbeb5405e48e8b6a27284bb19c800052f93896d8..bcc0a7e8f202f72a710f7c5ce3988b56de96cc07 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar  2 14:46:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gmodule-beos.c (_g_module_build_path) * gmodule-dyld.c (_g_module_build_path) 
+         gmodule-dl.c (_g_module_build_path): Use G_MODULE_SUFFIX rather than
+       a hardcoded ".so". (#72803)
+
 Sun Feb 17 18:15:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gmodule.c (g_module_open): Fix typo when checking

diff --git a/gmodule/gmodule-beos.c b/gmodule/gmodule-beos.c
index 64a5396fd5537116d1c331a4f120a0f772e80fc0..edd6b893f4f08f7f1f00cb96f64b802e76ba184c 100644 (file)
--- a/gmodule/gmodule-beos.c
+++ b/gmodule/gmodule-beos.c
@@ -190,10 +190,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);
 }

diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
index 3ea449338e422be7499b1c9ee1c8d4755b123205..28dc8a90335bbeb7e21d4c3ed2001e3994581bd8 100644 (file)
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.c
@@ -154,9 +154,9 @@ _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);
 }

diff --git a/gmodule/gmodule-dyld.c b/gmodule/gmodule-dyld.c
index fed8811721242834ea4a1d1cb7e397c4d640a913..93bfc7771b6b800dd53f337202eced0fbd9f5464 100644 (file)
--- a/gmodule/gmodule-dyld.c
+++ b/gmodule/gmodule-dyld.c
@@ -141,10 +141,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);
 }