From: Bruno Haible Date: Sat, 24 Mar 2007 15:52:20 +0000 (+0000) Subject: Update after gnulib change: Use "unistr.h". X-Git-Tag: v0.17~441 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d00a8f6a82b0a971b61930dfe3ee3cbe167ce938;p=thirdparty%2Fgettext.git Update after gnulib change: Use "unistr.h". --- diff --git a/gettext-tools/gnulib-lib/.cvsignore b/gettext-tools/gnulib-lib/.cvsignore index f7dff0c32..66f5257bd 100644 --- a/gettext-tools/gnulib-lib/.cvsignore +++ b/gettext-tools/gnulib-lib/.cvsignore @@ -178,16 +178,11 @@ tls.c tls.h tmpdir.c tmpdir.h -ucs4-utf8.h unistd_.h unistr unitypes.h unlocked-io.h unsetenv.c -utf16-ucs4-unsafe.h -utf16-ucs4.h -utf8-ucs4-unsafe.h -utf8-ucs4.h vasprintf.h verify.h w32spawn.h diff --git a/gettext-tools/libgettextpo/.cvsignore b/gettext-tools/libgettextpo/.cvsignore index f6a151717..503d4300a 100644 --- a/gettext-tools/libgettextpo/.cvsignore +++ b/gettext-tools/libgettextpo/.cvsignore @@ -81,14 +81,9 @@ string_.h strnlen.c tls.c tls.h -ucs4-utf8.h unistr unitypes.h unlocked-io.h -utf16-ucs4.h -utf16-ucs4-unsafe.h -utf8-ucs4.h -utf8-ucs4-unsafe.h vasprintf.c vasprintf.h wchar_.h diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 863c2cd60..3a5554f8b 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,22 @@ +2007-03-24 Bruno Haible + + * po-lex.c: Include unistr.h instead of utf8-ucs4.h. + * read-properties.c: Include unistr.h instead of utf16-ucs4.h, + ucs4-utf8.h. + * x-java.c: Likewise. + * read-stringtable.c: Include unistr.h instead of utf8-ucs4.h, + ucs4-utf8.h. + * x-csharp.c: Likewise. + * write-csharp.c: Include unistr.h instead of utf8-ucs4.h. + * write-java.c: Likewise. + * write-properties.c: Likewise. + * write-qt.c: Likewise. + * write-tcl.c: Likewise. + * x-perl.c: Likewise. + * x-python.c: Include unistr.h instead of utf8-ucs4.h, utf16-ucs4.h, + ucs4-utf8.h. + * x-tcl.c: Include unistr.h instead of ucs4-utf8.h. + 2007-03-17 Bruno Haible * x-php.c (enum token_type_ty): New values token_type_lbracket, diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c index a328d5eb4..ba164e12c 100644 --- a/gettext-tools/src/po-lex.c +++ b/gettext-tools/src/po-lex.c @@ -56,7 +56,7 @@ #define _(str) gettext(str) #if HAVE_ICONV -# include "utf8-ucs4.h" +# include "unistr.h" #endif #if HAVE_DECL_GETC_UNLOCKED diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c index ac02014c1..d6e8b8e87 100644 --- a/gettext-tools/src/read-properties.c +++ b/gettext-tools/src/read-properties.c @@ -1,5 +1,5 @@ /* Reading Java .properties files. - Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -38,8 +38,7 @@ #include "xvasprintf.h" #include "po-xerror.h" #include "msgl-ascii.h" -#include "utf16-ucs4.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c index a2dd54c20..f563133f2 100644 --- a/gettext-tools/src/read-stringtable.c +++ b/gettext-tools/src/read-stringtable.c @@ -1,5 +1,5 @@ /* Reading NeXTstep/GNUstep .strings files. - Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -36,8 +36,7 @@ #include "xalloc.h" #include "xvasprintf.h" #include "po-xerror.h" -#include "utf8-ucs4.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c index efd7750b7..f2bfd415e 100644 --- a/gettext-tools/src/write-csharp.c +++ b/gettext-tools/src/write-csharp.c @@ -92,7 +92,7 @@ #include "filename.h" #include "fwriteerror.h" #include "clean-temp.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c index 9e26e45a5..4733dbc0c 100644 --- a/gettext-tools/src/write-java.c +++ b/gettext-tools/src/write-java.c @@ -76,7 +76,7 @@ #include "filename.h" #include "fwriteerror.h" #include "clean-temp.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/write-properties.c b/gettext-tools/src/write-properties.c index f5169fff8..7110609a4 100644 --- a/gettext-tools/src/write-properties.c +++ b/gettext-tools/src/write-properties.c @@ -1,5 +1,5 @@ /* Writing Java .properties files. - Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -34,7 +34,7 @@ #include "msgl-ascii.h" #include "msgl-iconv.h" #include "po-charset.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "ostream.h" #include "write-po.h" #include "xalloc.h" diff --git a/gettext-tools/src/write-qt.c b/gettext-tools/src/write-qt.c index 29da2ffb8..2f1d7fb2f 100644 --- a/gettext-tools/src/write-qt.c +++ b/gettext-tools/src/write-qt.c @@ -36,7 +36,7 @@ #include "po-charset.h" #include "msgl-iconv.h" #include "hash-string.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "xalloc.h" #include "obstack.h" #include "hash.h" diff --git a/gettext-tools/src/write-tcl.c b/gettext-tools/src/write-tcl.c index 7367db829..bc1675041 100644 --- a/gettext-tools/src/write-tcl.c +++ b/gettext-tools/src/write-tcl.c @@ -39,7 +39,7 @@ #include "xallocsa.h" #include "filename.h" #include "fwriteerror.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "gettext.h" #define _(str) gettext (str) diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c index d64507c1d..c469a0c67 100644 --- a/gettext-tools/src/x-csharp.c +++ b/gettext-tools/src/x-csharp.c @@ -40,8 +40,7 @@ #include "xvasprintf.h" #include "hash.h" #include "po-charset.h" -#include "utf8-ucs4.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(s) gettext(s) diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c index 5faeda077..57dcf0a8a 100644 --- a/gettext-tools/src/x-java.c +++ b/gettext-tools/src/x-java.c @@ -36,8 +36,7 @@ #include "xalloc.h" #include "hash.h" #include "po-charset.h" -#include "utf16-ucs4.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(s) gettext(s) diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c index a06814dc9..fc3d498cf 100644 --- a/gettext-tools/src/x-perl.c +++ b/gettext-tools/src/x-perl.c @@ -37,7 +37,7 @@ #include "error-progname.h" #include "xalloc.h" #include "po-charset.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "uniname.h" #include "getline.h" #include "gettext.h" diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index 05d1f4899..a23b107ea 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -45,9 +45,7 @@ #include "c-ctype.h" #include "po-charset.h" #include "uniname.h" -#include "utf16-ucs4.h" -#include "utf8-ucs4.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(s) gettext(s) diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c index a24ddd7ae..cbfde8ad7 100644 --- a/gettext-tools/src/x-tcl.c +++ b/gettext-tools/src/x-tcl.c @@ -40,7 +40,7 @@ #include "hash.h" #include "c-ctype.h" #include "po-charset.h" -#include "ucs4-utf8.h" +#include "unistr.h" #include "gettext.h" #define _(s) gettext(s) diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index f2aefb297..de4baca99 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,7 @@ +2007-03-24 Bruno Haible + + * lib/html-ostream.oo.c: Include unistr.h instead of utf8-ucs4.h. + 2007-03-16 Bruno Haible * lib/html-ostream.oo.c (html_ostream_create): Update after signature diff --git a/gnulib-local/lib/html-ostream.oo.c b/gnulib-local/lib/html-ostream.oo.c index 5e8370e50..59e09d9ee 100644 --- a/gnulib-local/lib/html-ostream.oo.c +++ b/gnulib-local/lib/html-ostream.oo.c @@ -27,7 +27,7 @@ #include "gl_list.h" #include "gl_array_list.h" -#include "utf8-ucs4.h" +#include "unistr.h" #include "xalloc.h" struct html_ostream : struct ostream