Commit 96086833 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Fix up to correspond to configure.in checks.

Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>

	* gutf8.c (g_utf8_get_charset_internal): Fix up
	to correspond to configure.in checks.
parent 8384a134
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
Mon Jul 3 17:58:02 2000 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_utf8_get_charset_internal): Fix up
to correspond to configure.in checks.
Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com> Mon Jul 3 17:18:19 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Comment g_get_codeset() out of the header file * glib.h: Comment g_get_codeset() out of the header file
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LANGINFO_H #ifdef HAVE_CODESET
#include <langinfo.h> #include <langinfo.h>
#endif #endif
#include <string.h> #include <string.h>
...@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a) ...@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a)
if (charset && strstr (charset, "UTF-8")) if (charset && strstr (charset, "UTF-8"))
return TRUE; return TRUE;
#ifdef _NL_CTYPE_CODESET_NAME #ifdef HAVE_CODESET
charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); charset = nl_langinfo(CODESET);
if (charset) if (charset)
{ {
if (a && ! *a) if (a && ! *a)
...@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a) ...@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a)
if (strcmp (charset, "UTF-8") == 0) if (strcmp (charset, "UTF-8") == 0)
return TRUE; return TRUE;
} }
#elif CODESET #endif
charset = nl_langinfo(CODESET);
#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */
charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
if (charset) if (charset)
{ {
if (a && ! *a) if (a && ! *a)
...@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a) ...@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a)
if (strcmp (charset, "UTF-8") == 0) if (strcmp (charset, "UTF-8") == 0)
return TRUE; return TRUE;
} }
#endif #endif
if (a && ! *a) if (a && ! *a)
*a = "US-ASCII"; *a = "US-ASCII";
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LANGINFO_H #ifdef HAVE_CODESET
#include <langinfo.h> #include <langinfo.h>
#endif #endif
#include <string.h> #include <string.h>
...@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a) ...@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a)
if (charset && strstr (charset, "UTF-8")) if (charset && strstr (charset, "UTF-8"))
return TRUE; return TRUE;
#ifdef _NL_CTYPE_CODESET_NAME #ifdef HAVE_CODESET
charset = nl_langinfo (_NL_CTYPE_CODESET_NAME); charset = nl_langinfo(CODESET);
if (charset) if (charset)
{ {
if (a && ! *a) if (a && ! *a)
...@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a) ...@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a)
if (strcmp (charset, "UTF-8") == 0) if (strcmp (charset, "UTF-8") == 0)
return TRUE; return TRUE;
} }
#elif CODESET #endif
charset = nl_langinfo(CODESET);
#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */
charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
if (charset) if (charset)
{ {
if (a && ! *a) if (a && ! *a)
...@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a) ...@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a)
if (strcmp (charset, "UTF-8") == 0) if (strcmp (charset, "UTF-8") == 0)
return TRUE; return TRUE;
} }
#endif #endif
if (a && ! *a) if (a && ! *a)
*a = "US-ASCII"; *a = "US-ASCII";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment