X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b91e9676639abcb81181f036923c44d4a71c251a..c0fff5a4f4e765e5bb9f01a5d380cbdc098d04e6:/stglibs/common.lib/common.cpp?ds=sidebyside

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index 8c3eb1a5..8b62e68b 100644
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -47,6 +47,8 @@
 
 #include <iconv.h>
 
+#include <algorithm>
+
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
@@ -750,6 +752,11 @@ if (errno == ERANGE)
 
 return 0;
 }
+//---------------------------------------------------------------------------
+int str2x(const std::string & str, double & x)
+{
+return strtodouble2(str.c_str(), x);
+}
 #ifndef WIN32
 //---------------------------------------------------------------------------
 int str2x(const std::string & str, int64_t & x)
@@ -897,7 +904,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;