--- a/secureswitools/swisistools/source/interpretsis/main.cpp	Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsis/main.cpp	Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -29,22 +29,6 @@
 #include "logger.h"
 #include "../common/exception.h"
 
-
-#ifndef _WIN32
-#include <ctype.h>
-
-//__ctype_b was removed from glibc. This is a workaround to fix the linking problem
-extern "C"
-    {
-    const unsigned short int** __ctype_b()
-        {
-        return __ctype_b_loc();
-        }
-    }
-
-#endif // _WIN32
-
-
 int main(int argc, const char* argv[])
 	{
 	bool pauseWhenDone = false;
@@ -64,7 +48,7 @@
 
 		if (options.LogFile().size() > 0)
 			{
-			logFile = new std::wofstream(wstring2string(options.LogFile()).c_str(), std::ios::app);
+			logFile = new std::wofstream(Ucs2ToUtf8(options.LogFile()).c_str(), std::ios::app);
 			Logger::SetStream(*logFile);
 			}
 		else
@@ -106,7 +90,7 @@
     	}
 	catch  (InterpretSisError& e)
 		{
-		LERROR(L"\t" << string2wstring(e.what()));
+		LERROR(L"\t" << Utf8ToUcs2(e.what()));
 		result =  e.GetErrorCode();
 		}
 	catch (CSISException e)
@@ -125,7 +109,7 @@
 #endif
 	catch (std::exception &err)
 		{
-		std::wstring emessage = string2wstring( err.what() );
+		std::wstring emessage = Utf8ToUcs2( err.what() );
 		LERROR( L"Error: " << emessage);
 		result = STD_EXCEPTION;
 		}