From 71d8e11c459129aeb1543afac5e2b8cb36a482a8 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 20 Sep 2002 00:01:25 +0000 Subject: Make locale_charset a char *, not const char *. Kills a warning in the * gal/util/e-iconv.c: Make locale_charset a char *, not const char *. Kills a warning in the !HAVE_CODESET case. (e_iconv_init): No longer need to cast locale_charset to (char *) while mangling it in the HAVE_CODESET case. * gal/util/e-xml-utils.c: #include for free() * gal/widgets/e-categories-master-list-array.c: Likewise svn path=/trunk/; revision=18129 --- e-util/e-iconv.c | 4 ++-- e-util/e-xml-utils.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e-util/e-iconv.c b/e-util/e-iconv.c index 64c0508cd5..d241e1bf7d 100644 --- a/e-util/e-iconv.c +++ b/e-util/e-iconv.c @@ -96,7 +96,7 @@ static GHashTable *iconv_cache_open; static unsigned int iconv_cache_size = 0; static GHashTable *iconv_charsets = NULL; -static const char *locale_charset = NULL; +static char *locale_charset = NULL; struct { char *charset; @@ -227,7 +227,7 @@ e_iconv_init(int keep) } else { #ifdef HAVE_CODESET locale_charset = g_strdup(nl_langinfo(CODESET)); - g_strdown((char *)locale_charset); + g_strdown(locale_charset); #else /* A locale name is typically of the form language[_terri- * tory][.codeset][@modifier], where language is an ISO 639 diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index e8f6b0a1b9..f80d6f0b93 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -33,6 +33,7 @@ #include "e-xml-utils.h" #include +#include #include #include #include -- cgit v1.2.3