From 7fcc49322894589a3951d04ad9bb16c52287cee2 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:05:44 +0000 Subject: [PATCH] 2003-02-19 Tor Lillqvist Author: tml Date: 2003-02-19 19:24:14 GMT 2003-02-19 Tor Lillqvist * pkg.c (add_env_variable_to_list): Use G_SEARCHPATH_SEPARATOR_S instead of hardcoded ":". (verify_package): Don't use /usr/include on Win32. --- ChangeLog | 6 ++++++ pkg.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 151b341..4420165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-02-19 Tor Lillqvist + + * pkg.c (add_env_variable_to_list): Use G_SEARCHPATH_SEPARATOR_S + instead of hardcoded ":". + (verify_package): Don't use /usr/include on Win32. + 2003-02-15 Havoc Pennington * pkg.c (verify_package): patch from Nalin to use /usr/lib64 as diff --git a/pkg.c b/pkg.c index 6fd9362..4a91326 100644 --- a/pkg.c +++ b/pkg.c @@ -652,9 +652,7 @@ add_env_variable_to_list (GSList *list, const gchar *env) gchar **values; gint i; - /* FIXME: the separator should be a ';' on Windows - */ - values = g_strsplit (env, ":", 0); + values = g_strsplit (env, G_SEARCHPATH_SEPARATOR_S, 0); for (i = 0; values[i] != NULL; i++) { list = g_slist_append (list, g_strdup (values[i])); @@ -787,8 +785,10 @@ verify_package (Package *pkg) /* We make a list of system directories that gcc expects so we can remove * them. */ +#ifndef G_OS_WIN32 system_directories = g_slist_append (NULL, g_strdup ("/usr/include")); - +#endif + c_include_path = g_getenv ("C_INCLUDE_PATH"); if (c_include_path != NULL) { -- 2.39.5