mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-08 03:45:49 +01:00
b6d8893eb7
Fri Sep 28 19:41:32 2001 Owen Taylor <otaylor@redhat.com> * glib/libcharset/* configure.in: Fix macros from libcharset to work with autoconf-2.5x. (From Laszlo Peter.)
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
# Patch against libcharset version 1.1
|
|
--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/lib/localcharset.c Wed Aug 8 08:52:28 2001
|
|
+++ localcharset.c Wed Sep 26 22:47:38 2001
|
|
@@ -83,8 +83,8 @@
|
|
static const char * volatile charset_aliases;
|
|
|
|
/* Return a pointer to the contents of the charset.alias file. */
|
|
-static const char *
|
|
-get_charset_aliases ()
|
|
+const char *
|
|
+_g_locale_get_charset_aliases ()
|
|
{
|
|
const char *cp;
|
|
|
|
@@ -205,7 +205,7 @@
|
|
STATIC
|
|
#endif
|
|
const char *
|
|
-locale_charset ()
|
|
+_g_locale_charset ()
|
|
{
|
|
const char *codeset;
|
|
const char *aliases;
|
|
@@ -262,7 +262,7 @@
|
|
codeset = "";
|
|
|
|
/* Resolve alias. */
|
|
- for (aliases = get_charset_aliases ();
|
|
+ for (aliases = _g_locale_get_charset_aliases ();
|
|
*aliases != '\0';
|
|
aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
|
|
if (strcmp (codeset, aliases) == 0
|
|
--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/m4/glibc21.m4 Sat Jun 17 14:31:21 2000
|
|
+++ glibc21.m4 Fri Sep 28 12:12:39 2001
|
|
@@ -3,7 +3,7 @@
|
|
# Test for the GNU C Library, version 2.1 or newer.
|
|
# From Bruno Haible.
|
|
|
|
-AC_DEFUN(jm_GLIBC21,
|
|
+AC_DEFUN([jm_GLIBC21],
|
|
[
|
|
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
|
ac_cv_gnu_library_2_1,
|
|
--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/m4/codeset.m4 Mon Apr 3 04:06:24 2000
|
|
+++ codeset.m4 Fri Sep 28 12:12:44 2001
|
|
@@ -2,7 +2,7 @@
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
-AC_DEFUN(jm_LANGINFO_CODESET,
|
|
+AC_DEFUN([jm_LANGINFO_CODESET],
|
|
[
|
|
AC_CHECK_HEADERS(langinfo.h)
|
|
AC_CHECK_FUNCS(nl_langinfo)
|
|
--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/include/libcharset.h.in Tue Mar 27 08:34:42 2001
|
|
+++ libcharset.h Wed Sep 26 21:55:40 2001
|
|
@@ -30,8 +30,8 @@
|
|
The result must not be freed; it is statically allocated.
|
|
If the canonical name cannot be determined, the result is a non-canonical
|
|
name. */
|
|
-extern const char * locale_charset (void);
|
|
-
|
|
+extern const char * _g_locale_charset (void);
|
|
+extern const char * _g_locale_get_charset_aliases (void);
|
|
|
|
#ifdef __cplusplus
|
|
}
|