Merge Python 3 porting: additional chnages.

[modules/kernel.git] / src / Basics / Basics_Utils.hxx

diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 4ca0f7c..cef9dc3
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,6 @@
 #ifndef WIN32
 #include <sys/time.h>
 #else
-#include <winsock2.h>
 #include <windows.h>
 #pragma comment(lib,"winmm.lib")
 #endif
@@ -57,6 +56,11 @@ namespace Kernel_Utils
     ObjectdID       //!< Global usage object identifier ID
   };
 
+  const wchar_t* decode(const char* encoded);
+  const wchar_t* decode_s(std::string encoded);
+  const char* encode(const wchar_t* decoded);
+  std::string encode_s(const wchar_t* decoded);
+
   //! Get predefined GUID
   BASICS_EXPORT std::string GetGUID( GUIDtype );
 #ifndef WIN32