Update after gnulib change: Use "unistr.h".

diff --git a/gettext-tools/gnulib-lib/.cvsignore b/gettext-tools/gnulib-lib/.cvsignore
index f7dff0c32d91bb4c553a3b1e4af6239aa6883b51..66f5257bdedbc6ee17e021b94328d667ed93da5c 100644 (file)
--- 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 f6a151717b32f86a79d4571cb63eb341f4cd4d65..503d4300aff7322f1b03a84ef5153d365afa442d 100644 (file)
--- 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 863c2cd60caba0c879ac6e600bc87427cf862bb2..3a5554f8b1cbdc65e10805e284937cdcab3908aa 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,22 @@
+2007-03-24  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <bruno@clisp.org>
 
        * 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 a328d5eb487311e045a9f4da38c28ea4975576a4..ba164e12cee285cfcb94c6a023d81be3945c71d9 100644 (file)
--- 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 ac02014c15cddef54772748eca99c3f7d5b81448..d6e8b8e87eab8d08a5f495cbba9b1ff474e7abf6 100644 (file)
--- 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 <bruno@clisp.org>, 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 a2dd54c2041a3a58423d8ed0de10756a9f7fe120..f563133f2e3ca7719c4676d56652a6e3ca0c6179 100644 (file)
--- 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 <bruno@clisp.org>, 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 efd7750b74f7bcf27121c777ec870b330b16e8bf..f2bfd415eba88c47b4e0581b02aa861692cc5401 100644 (file)
--- 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 9e26e45a5166dc32560791635139cdb96ec48e07..4733dbc0c29fd03d876062dcd04c185f46700bd0 100644 (file)
--- 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 f5169fff82b84d2c8f7b29490cf192ed3c71f30c..7110609a4aa0418caf592c2bae2cd751c3ce175c 100644 (file)
--- 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 <bruno@clisp.org>, 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 29da2ffb836e19d7afb1a9fb79c6e5ead90da046..2f1d7fb2f7d134006f79f91b2faee41454dbee5b 100644 (file)
--- 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 7367db829d710e9b196f745330761b773c3a98c8..bc1675041b262bf41594d743e0d7abaf01b444e9 100644 (file)
--- 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 d64507c1db97a89f3dc291c9227109741de4e85f..c469a0c67fbb9d487f87c93823044736d224fa80 100644 (file)
--- 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 5faeda07758d63eaf4f2ac9eecf35cd8c7281636..57dcf0a8a24251a8326ba3c0e0b1f4f45ce2ecaa 100644 (file)
--- 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 a06814dc91b4d6840ed39e48826de88ba4a342e9..fc3d498cf8576094edb345a33b194b14737d763d 100644 (file)
--- 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 05d1f4899a9bdc40af2858fca5d48d54008bbc75..a23b107ea39295fa09d496e12d989cfbd48e1d48 100644 (file)
--- 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 a24ddd7ae618491fb5a8271ab5571d0c04adbf58..cbfde8ad75de18d09c9602c9e45773cd74f60487 100644 (file)
--- 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 f2aefb29746605c8621f8499245cdd2a905332a0..de4baca99caee919dc2138d0619c590e281fc37f 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-24  Bruno Haible  <bruno@clisp.org>
+
+       * lib/html-ostream.oo.c: Include unistr.h instead of utf8-ucs4.h.
+
 2007-03-16  Bruno Haible  <bruno@clisp.org>
 
        * 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 5e8370e50667f5548f68bee024c725af38abddd5..59e09d9ee74ce26c4dc5aabdc811a951473fd3f8 100644 (file)
--- 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