From 224e0b76f63c495246e8137a2dd3a84b7b34bd5f Mon Sep 17 00:00:00 2001 From: 5 Date: Fri, 8 Apr 2005 05:52:20 +0000 Subject: [PATCH] Declare glib_top_share_dir and exe_top_share_dir only in G_OS_WIN32. Thu Apr 7 22:51:15 2005 * glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir and exe_top_share_dir only in G_OS_WIN32. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.c | 3 ++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81d97b5e5..3d990c806 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 7 22:51:15 2005 + + * glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir + and exe_top_share_dir only in G_OS_WIN32. + 2005-04-08 Tor Lillqvist * glib/gutils.c (g_get_system_data_dirs): After investigating more diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 81d97b5e5..3d990c806 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Apr 7 22:51:15 2005 + + * glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir + and exe_top_share_dir only in G_OS_WIN32. + 2005-04-08 Tor Lillqvist * glib/gutils.c (g_get_system_data_dirs): After investigating more diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 81d97b5e5..3d990c806 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Apr 7 22:51:15 2005 + + * glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir + and exe_top_share_dir only in G_OS_WIN32. + 2005-04-08 Tor Lillqvist * glib/gutils.c (g_get_system_data_dirs): After investigating more diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 81d97b5e5..3d990c806 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Apr 7 22:51:15 2005 + + * glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir + and exe_top_share_dir only in G_OS_WIN32. + 2005-04-08 Tor Lillqvist * glib/gutils.c (g_get_system_data_dirs): After investigating more diff --git a/glib/gutils.c b/glib/gutils.c index e65a17175..ee5a954ef 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -2060,13 +2060,14 @@ g_get_user_cache_dir (void) G_CONST_RETURN gchar * G_CONST_RETURN * g_get_system_data_dirs (void) { - gchar *data_dirs, *glib_top_share_dir, *exe_top_share_dir, **data_dir_vector; + gchar *data_dirs, **data_dir_vector; G_LOCK (g_utils_global); if (!g_system_data_dirs) { #ifdef G_OS_WIN32 + gchar *glib_top_share_dir, *exe_top_share_dir; /* Documents and Settings\All Users\Application Data */ char *appdata = get_special_folder (CSIDL_COMMON_APPDATA);