+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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* glib.h: Comment g_get_codeset() out of the header file
#include <config.h>
#include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
+#ifdef HAVE_CODESET
#include <langinfo.h>
#endif
#include <string.h>
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)
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)
if (strcmp (charset, "UTF-8") == 0)
return TRUE;
}
-#endif
+#endif
if (a && ! *a)
*a = "US-ASCII";
#include <config.h>
#include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
+#ifdef HAVE_CODESET
#include <langinfo.h>
#endif
#include <string.h>
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)
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)
if (strcmp (charset, "UTF-8") == 0)
return TRUE;
}
-#endif
+#endif
if (a && ! *a)
*a = "US-ASCII";