luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-29 18:36:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing g_pattern_match_simple and g_pattern_spec_equal.

Browse Source 
2001-10-28  Tor Lillqvist  <tml@iki.fi>

	* glib/glib.def: Add missing g_pattern_match_simple and
	g_pattern_spec_equal.

	* glib/gwin32.c (g_win32_get_package_installation_subdirectory):
	Set separator correctly.

	* glib/libcharset/config.charset (os): Match also mingw*.

	* tests/testglib.c (main): (Win32): Print the lib/locale
	subdirectory, as that is what actually gets used.
This commit is contained in:
Tor Lillqvist
2001-10-28 21:05:03 +00:00
committed by Tor Lillqvist
parent d59c859aec
commit 9c35df3de3
12 changed files with 114 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gwin32.c
View File

@@ -771,8 +771,12 @@ g_win32_get_package_installation_subdirectory (gchar *package,
prefix = g_win32_get_package_installation_directory (package, dll_name);
sep = ((subdir != NULL && strlen (subdir) > 0) || prefix[strlen (prefix) - 1] == G_DIR_SEPARATOR ?
"" : G_DIR_SEPARATOR_S);
if (subdir == NULL)
subdir = "";
sep = (subdir[0] == '\0' ||
prefix[strlen (prefix) - 1] == G_DIR_SEPARATOR) ?
"" : G_DIR_SEPARATOR_S;
return g_strconcat (prefix, sep, subdir, NULL);
}