luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

On Cygwin, use the "cyg" prefix, and accept also the normal "lib".

Browse Source 
2004-03-31  Tor Lillqvist  <tml@iki.fi>

	* gmodule-win32.c (_g_module_build_path): On Cygwin, use the "cyg"
	prefix, and accept also the normal "lib". (#138403, Roger Leigh)
This commit is contained in:
Tor Lillqvist 2004-03-31 02:02:02 +00:00 committed by Tor Lillqvist
parent 81f3d4e713
commit 81f9b7dba5
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gmodule/ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-31 Tor Lillqvist <tml@iki.fi>
* gmodule-win32.c (_g_module_build_path): On Cygwin, use the "cyg"
prefix, and accept also the normal "lib". (#138403, Roger Leigh)
Tue Feb 24 14:09:21 2004 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.3 ===

14
gmodule/gmodule-win32.c
View File

@ -230,14 +230,28 @@ _g_module_build_path (const gchar *directory,
if (directory && *directory)
if (k > 4 && g_ascii_strcasecmp (module_name + k - 4, ".dll") == 0)
return g_strconcat (directory, G_DIR_SEPARATOR_S, module_name, NULL);
#ifdef G_WITH_CYGWIN
else if (strncmp (module_name, "lib", 3) == 0 || strncmp (module_name, "cyg", 3) == 0)
return g_strconcat (directory, G_DIR_SEPARATOR_S, module_name, ".dll", NULL);
else
return g_strconcat (directory, G_DIR_SEPARATOR_S, "cyg", module_name, ".dll", NULL);
#else
else if (strncmp (module_name, "lib", 3) == 0)
return g_strconcat (directory, G_DIR_SEPARATOR_S, module_name, ".dll", NULL);
else
return g_strconcat (directory, G_DIR_SEPARATOR_S, "lib", module_name, ".dll", NULL);
#endif
else if (k > 4 && g_ascii_strcasecmp (module_name + k - 4, ".dll") == 0)
return g_strdup (module_name);
#ifdef G_WITH_CYGWIN
else if (strncmp (module_name, "lib", 3) == 0 || strncmp (module_name, "cyg", 3) == 0)
return g_strconcat (module_name, ".dll", NULL);
else
return g_strconcat ("cyg", module_name, ".dll", NULL);
#else
else if (strncmp (module_name, "lib", 3) == 0)
return g_strconcat (module_name, ".dll", NULL);
else
return g_strconcat ("lib", module_name, ".dll", NULL);
#endif
}