Subject: Re: Commit: Re: [Fwd]: Re: Patch: Fix for Bug 1164, 2nd try
From: ha shao (hashao@chinese.com)
Date: Mon Jun 04 2001 - 23:42:25 CDT
On Mon, Jun 04, 2001 at 10:11:27PM +0200, hfiguiere@teaser.fr wrote:
> Committed:
>
> Checking in src/af/util/xp/ut_mbtowc.cpp;
> /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp,v <-- ut_mbtowc.cpp
> new revision: 1.19; previous revision: 1.18
> done
Somehow the commit failed:
around 278
......................................................................
} else {
<<<<<<< ut_mbtowc.cpp
if (errno==EINVAL) {
UT_iconv_reset(cd); /* reset iconv, pointer might be messed up. */
return 0; /* need more chars */
}
=======
if (errno==EINVAL)
{
UT_iconv_reset(cd); /* reset iconv, pointer might be messed
up. */
return 0; /* need more chars */
}
>>>>>>> 1.19
else {
initialize();/*wrong seq*/
-- Best regard hashao
This archive was generated by hypermail 2b25 : Mon Jun 04 2001 - 23:41:42 CDT