From 960868332881b9ca1dc94baafa8aa42c07df3101 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 3 Jul 2000 22:01:58 +0000 Subject: [PATCH] Fix up to correspond to configure.in checks. Mon Jul 3 17:58:02 2000 Owen Taylor * gutf8.c (g_utf8_get_charset_internal): Fix up to correspond to configure.in checks. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutf8.c | 14 ++++++++------ gutf8.c | 14 ++++++++------ 10 files changed, 56 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9f1253..ab7b6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e9f1253..ab7b6a0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Jul 3 17:58:02 2000 Owen Taylor + + * gutf8.c (g_utf8_get_charset_internal): Fix up + to correspond to configure.in checks. + Mon Jul 3 17:18:19 2000 Owen Taylor * glib.h: Comment g_get_codeset() out of the header file diff --git a/glib/gutf8.c b/glib/gutf8.c index da5364c..3220d3d 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -22,7 +22,7 @@ #include #include -#ifdef HAVE_LANGINFO_H +#ifdef HAVE_CODESET #include #endif #include @@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a) if (charset && strstr (charset, "UTF-8")) return TRUE; -#ifdef _NL_CTYPE_CODESET_NAME - charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); +#ifdef HAVE_CODESET + charset = nl_langinfo(CODESET); if (charset) { if (a && ! *a) @@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a) if (strcmp (charset, "UTF-8") == 0) return TRUE; } -#elif CODESET - charset = nl_langinfo(CODESET); +#endif + +#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */ + charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); if (charset) { if (a && ! *a) @@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a) if (strcmp (charset, "UTF-8") == 0) return TRUE; } -#endif +#endif if (a && ! *a) *a = "US-ASCII"; diff --git a/gutf8.c b/gutf8.c index da5364c..3220d3d 100644 --- a/gutf8.c +++ b/gutf8.c @@ -22,7 +22,7 @@ #include #include -#ifdef HAVE_LANGINFO_H +#ifdef HAVE_CODESET #include #endif #include @@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a) if (charset && strstr (charset, "UTF-8")) return TRUE; -#ifdef _NL_CTYPE_CODESET_NAME - charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); +#ifdef HAVE_CODESET + charset = nl_langinfo(CODESET); if (charset) { if (a && ! *a) @@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a) if (strcmp (charset, "UTF-8") == 0) return TRUE; } -#elif CODESET - charset = nl_langinfo(CODESET); +#endif + +#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */ + charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); if (charset) { if (a && ! *a) @@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a) if (strcmp (charset, "UTF-8") == 0) return TRUE; } -#endif +#endif if (a && ! *a) *a = "US-ASCII"; -- 2.7.4