diff -r 1799ab513ec3 -r 26914f8d1faf charconvfw/charconv_fw/tools/convtool/convtool.cpp --- a/charconvfw/charconv_fw/tools/convtool/convtool.cpp Tue May 11 17:53:33 2010 +0300 +++ b/charconvfw/charconv_fw/tools/convtool/convtool.cpp Tue May 25 14:39:28 2010 +0300 @@ -30,6 +30,14 @@ #undef BIG_ENDIAN +#if (defined(__MSVCRT__) || defined(_MSC_VER)) +//#define _stricmp _stricmp +//#define _strnicmp _strnicmp +#else // linux +#define _stricmp strcasecmp +#define _strnicmp strncasecmp +#endif + const int KVersionNumber=025; const int KLargeNumber=1000000; @@ -346,7 +354,7 @@ } } -void main(int aArgc, char* aArgv[]) +int main(int aArgc, char* aArgv[]) { int outputByteOrderMark=0; TByteOrder unicodeByteOrder=EByteOrderUnspecified; @@ -362,6 +370,6 @@ HandleByteOrderMarks(outputByteOrderMark, unicodeByteOrder, inputEncoding, outputEncoding, inputFile, outputFile); DoConversion(unicodeByteOrder, inputEncoding, outputEncoding, inputFile, outputFile); FlushAndCloseFiles(inputFile, outputFile); - exit(0); + return 0; }