Use u8_mbtoucr instead of u8_mbtouc in some places.

diff --git a/ChangeLog b/ChangeLog
index 9d765023039b8ef6cd662dc99191bb8a96a9f0a0..13a372985b9f2c08f37d7a3105902a9956ccf95f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-12  Bruno Haible  <bruno@clisp.org>
+
+       Use u8_mbtoucr instead of u8_mbtouc in some places.
+       * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC,
+       GNULIB_MODULES_LIBGETTEXTPO): Add unistr/u8-mbtoucr.
+
 2011-01-28  Bruno Haible  <bruno@clisp.org>
 
        Add a comment.

diff --git a/autogen.sh b/autogen.sh
index 00c1236f2d898ba05715aaee81b10c65139b211b..664ad08b31cfee5230b1b367a7685e3b7e9d2e4f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -190,6 +190,7 @@ if ! $skip_gnulib; then
       uniname/uniname
       unistd
       unistr/u8-mbtouc
+      unistr/u8-mbtoucr
       unistr/u8-uctomb
       unistr/u16-mbtouc
       uniwidth/width
@@ -282,6 +283,7 @@ if ! $skip_gnulib; then
       strerror
       unilbrk/ulc-width-linebreaks
       unistr/u8-mbtouc
+      unistr/u8-mbtoucr
       unistr/u8-uctomb
       unistr/u16-mbtouc
       uniwidth/width

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 1de8cc9686af7332db61d07b4e6cd261e9015d30..41dfb502fa51976c3b2f6922b4c404c3f38f36a9 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-02  Bruno Haible  <bruno@clisp.org>
+
+       Use u8_mbtoucr instead of u8_mbtouc in some places.
+       * po-lex.c (mbfile_getc): Call u8_mbtoucr instead of u8_mbtouc.
+       * x-csharp.c (phase2_getc): Likewise.
+       * x-python.c (phase2_getc): Likewise.
+       Needed after libunistring changed on 2010-11-13.
+
 2011-06-02  Bruno Haible  <bruno@clisp.org>
 
        Update after gnulib changed.

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 98943ec9c486cccd727024ba7d8b7b9db8fada36..3bf5449b6dd6313c16832cb4bc407de13aecfd1d 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2009, 2011 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
@@ -499,7 +499,7 @@ incomplete multibyte sequence at end of line"));
               if (outbytes == 0)
                 abort ();
               /* Convert it from UTF-8 to UCS-4.  */
-              if (u8_mbtouc (&mbc->uc, scratchbuf, outbytes) < outbytes)
+              if (u8_mbtoucr (&mbc->uc, scratchbuf, outbytes) < (int) outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */

diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index aaf679429e557cdf39a3df408fc3c235b55b298e..ffadb0d7bcf7c5587f90eeaf87d0bb0b02b514af 100644 (file)
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2009, 2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -330,7 +330,7 @@ Please specify the correct source encoding through --from-code.\n"),
               while (insize > 0)
                 phase1_ungetc (buf[--insize]);
               /* Convert the character from UTF-8 to UCS-4.  */
-              if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes)
+              if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index fcc5150440c8e81d936fe2a5d4e76a9637b8d3c3..aa6a7d64c3b5074ea6ec862112413480b15e18af 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1,5 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2011 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -347,7 +347,7 @@ comment as specified in http://www.python.org/peps/pep-0263.html.\n"),
               while (insize > 0)
                 phase1_ungetc (buf[--insize]);
               /* Convert the character from UTF-8 to UCS-4.  */
-              if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes)
+              if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes)
                 {
                   /* scratchbuf contains an out-of-range Unicode character
                      (> 0x10ffff).  */