Match the prototype in gconvert.c to fix build problems in NetBSD.

2006-03-07  Matthias Clasen  <mclasen@redhat.com>

	* glib/gutf8.c (_g_charset_get_aliases): Match the prototype
	in gconvert.c to fix build problems in NetBSD.  (#333651,
	Julio M. Merino Vidal)
This commit is contained in:
Matthias Clasen 2006-03-07 16:32:38 +00:00 committed by Matthias Clasen
parent e9b421f212
commit b7420e0847
4 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2006-03-07 Matthias Clasen <mclasen@redhat.com>
* 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 <andersca@imendio.com>
* configure.in:

View File

@ -1,3 +1,9 @@
2006-03-07 Matthias Clasen <mclasen@redhat.com>
* 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 <andersca@imendio.com>
* configure.in:

View File

@ -1,3 +1,9 @@
2006-03-07 Matthias Clasen <mclasen@redhat.com>
* 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 <andersca@imendio.com>
* configure.in:

View File

@ -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 ();