stg-2.409 pre-merge.

[stg.git] / stglibs / common.lib / common.cpp

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index d0ff074c77e8a676db58ab3c542db6c7da18c729..76a1b42144b38aaec9382d516c73b8d991e6a61d 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -48,6 +48,7 @@
 #include <iconv.h>
 
 #include <algorithm>
+
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
@@ -344,20 +345,6 @@ for (size_t i = 0; i < src.length() / 2; i++)
     }
 }
 //---------------------------------------------------------------------------
-std::string Encode12str(const std::string & src)
-{
-std::string res;
-Encode12str(res, src);
-return res;
-}
-//---------------------------------------------------------------------------
-std::string Decode21str(const std::string & src)
-{
-std::string res;
-Decode21str(res, src);
-return res;
-}
-//---------------------------------------------------------------------------
 void Encode12(char * dst, const char * src, size_t srcLen)
 {
 for (size_t i = 0; i <= srcLen; i++)
@@ -934,7 +921,7 @@ strncpy(inBuf, source.c_str(), source.length());
 
 inBuf[source.length()] = 0;
 
-#if defined(FREE_BSD) || defined(FREE_BSD5) || defined(WIN32)
+#if defined(CONST_ICONV)
 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;