From: Matthias Clasen Date: Tue, 7 Mar 2006 16:32:38 +0000 (+0000) Subject: Match the prototype in gconvert.c to fix build problems in NetBSD. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b7420e0847e9bf8fc1c15beadf54681e44808934;p=dana%2Fcg-glib.git Match the prototype in gconvert.c to fix build problems in NetBSD. 2006-03-07 Matthias Clasen * glib/gutf8.c (_g_charset_get_aliases): Match the prototype in gconvert.c to fix build problems in NetBSD. (#333651, Julio M. Merino Vidal) --- diff --git a/ChangeLog b/ChangeLog index 48af3de1..efab9059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-07 Matthias Clasen + + * glib/gutf8.c (_g_charset_get_aliases): Match the prototype + in gconvert.c to fix build problems in NetBSD. (#333651, + Julio M. Merino Vidal) + 2006-03-06 Anders Carlsson * configure.in: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48af3de1..efab9059 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-03-07 Matthias Clasen + + * glib/gutf8.c (_g_charset_get_aliases): Match the prototype + in gconvert.c to fix build problems in NetBSD. (#333651, + Julio M. Merino Vidal) + 2006-03-06 Anders Carlsson * configure.in: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 48af3de1..efab9059 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2006-03-07 Matthias Clasen + + * glib/gutf8.c (_g_charset_get_aliases): Match the prototype + in gconvert.c to fix build problems in NetBSD. (#333651, + Julio M. Merino Vidal) + 2006-03-06 Anders Carlsson * configure.in: diff --git a/glib/gutf8.c b/glib/gutf8.c index 69105e23..f779b929 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -435,7 +435,7 @@ get_alias_hash (void) /* As an abuse of the alias table, the following routines gets * the charsets that are aliases for the canonical name. */ -const char ** +const char ** G_GNUC_INTERNAL _g_charset_get_aliases (const char *canonical_name) { GHashTable *alias_hash = get_alias_hash ();