Index: source/cfgmerge.cxx =================================================================== RCS file: /cvs/l10n/transex3/source/cfgmerge.cxx,v retrieving revision 1.23.2.1 diff -u -r1.23.2.1 cfgmerge.cxx --- source/cfgmerge.cxx 22 Feb 2003 15:00:25 -0000 1.23.2.1 +++ source/cfgmerge.cxx 13 Apr 2003 13:30:17 -0000 @@ -68,8 +68,8 @@ #include "tokens.h" #include "utf8conv.hxx" -extern "C" { yyerror( char * ); } -extern "C" { YYWarning( char * ); } +extern "C" { int yyerror( char * ); } +extern "C" { int YYWarning( char * ); } // defines to parse command line #define STATE_NON 0x0001 Index: source/export.cxx =================================================================== RCS file: /cvs/l10n/transex3/source/export.cxx,v retrieving revision 1.30.2.1 diff -u -r1.30.2.1 export.cxx --- source/export.cxx 31 Jan 2003 14:54:17 -0000 1.30.2.1 +++ source/export.cxx 13 Apr 2003 13:30:23 -0000 @@ -67,8 +67,8 @@ #include "tokens.h" #include "utf8conv.hxx" -extern "C" { yyerror( char * ); } -extern "C" { YYWarning( char * ); } +extern "C" { int yyerror( char * ); } +extern "C" { int YYWarning( char * ); } Export *pExport = 0L; Index: source/wrdtrans.cxx =================================================================== RCS file: /cvs/l10n/transex3/source/wrdtrans.cxx,v retrieving revision 1.1.1.1.68.1 diff -u -r1.1.1.1.68.1 wrdtrans.cxx --- source/wrdtrans.cxx 1 Apr 2003 11:09:15 -0000 1.1.1.1.68.1 +++ source/wrdtrans.cxx 13 Apr 2003 13:30:23 -0000 @@ -251,7 +251,7 @@ WordTrans_ErrorList::GetError( USHORT i_nNr, ByteString * o_pErrorText ) const { - if (0 <= i_nNr && i_nNr < aErrors.size() ) + if ( i_nNr < aErrors.size() ) { const ByteString & rError = aErrors[i_nNr]; const char * pErrorChars = rError.GetBuffer(); Index: source/xrmmerge.cxx =================================================================== RCS file: /cvs/l10n/transex3/source/xrmmerge.cxx,v retrieving revision 1.5 diff -u -r1.5 xrmmerge.cxx --- source/xrmmerge.cxx 12 Dec 2002 17:00:09 -0000 1.5 +++ source/xrmmerge.cxx 13 Apr 2003 13:30:24 -0000 @@ -68,8 +68,8 @@ #include "utf8conv.hxx" #include "tokens.h" -extern "C" { yyerror( char * ); } -extern "C" { YYWarning( char * ); } +extern "C" { int yyerror( char * ); } +extern "C" { int YYWarning( char * ); } // defines to parse command line #define STATE_NON 0x0001 @@ -438,7 +438,7 @@ ByteString sSearch( " " ); sSearch += rAttribute; sSearch += "="; - short nPos = sTmp.Search( sSearch ); + int nPos = sTmp.Search( sSearch ); if ( nPos != STRING_NOTFOUND ) { sTmp = sTmp.Copy( nPos );