X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Funicodeio.c;h=31201d38bd06cd0626ad9119de161fe2a4f3c0ed;hb=1056e42fdb8bb68c6afcdcb3a793558cae08ba44;hp=049b9afd0ae87039fe9dfa0fa3b44a7dc09eef15;hpb=27dc63a511abd7ff4e4aa737e02d382132d59bda;p=gnulib.git
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 049b9afd0..31201d38b 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,46 +1,33 @@
/* Unicode character output to streams with locale dependent encoding.
- Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2006 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
/* Written by Bruno Haible . */
/* Note: This file requires the locale_charset() function. See in
- libiconv-1.7/libcharset/INTEGRATE for how to obtain it. */
+ libiconv-1.8/libcharset/INTEGRATE for how to obtain it. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
-#if HAVE_STDDEF_H
-# include
-#endif
+/* Specification. */
+#include "unicodeio.h"
#include
-#if HAVE_STRING_H
-# include
-#else
-# include
-#endif
-
+#include
#include
-#ifndef errno
-extern int errno;
-#endif
#if HAVE_ICONV
# include
@@ -48,16 +35,11 @@ extern int errno;
#include
-#if ENABLE_NLS
-# include
-#else
-# define gettext(Text) Text
-#endif
-#define _(Text) gettext (Text)
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
-/* Specification. */
-#include "unicodeio.h"
+#include "localcharset.h"
/* When we pass a Unicode character to iconv(), we must pass it in a
suitable encoding. The standardized Unicode encodings are
@@ -118,10 +100,10 @@ utf8_wctomb (unsigned char *r, unsigned int wc)
Assumes that the locale doesn't change between two calls. */
long
unicode_to_mb (unsigned int code,
- long (*success) PARAMS ((const char *buf, size_t buflen,
- void *callback_arg)),
- long (*failure) PARAMS ((unsigned int code, const char *msg,
- void *callback_arg)),
+ long (*success) (const char *buf, size_t buflen,
+ void *callback_arg),
+ long (*failure) (unsigned int code, const char *msg,
+ void *callback_arg),
void *callback_arg)
{
static int initialized;
@@ -135,7 +117,6 @@ unicode_to_mb (unsigned int code,
if (!initialized)
{
- extern const char *locale_charset PARAMS ((void));
const char *charset = locale_charset ();
is_utf8 = !strcmp (charset, UTF8_NAME);
@@ -194,7 +175,7 @@ unicode_to_mb (unsigned int code,
)
return failure (code, NULL, callback_arg);
- /* Avoid glibc-2.1 bug and Solaris 2.7 bug. */
+ /* Avoid glibc-2.1 bug and Solaris 7 bug. */
# if defined _LIBICONV_VERSION \
|| !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)