1 files changed, 4 insertions, 34 deletions
diff --git a/common/strutils.h b/common/strutils.h
index db9b07c6..0c7a0e22 100644
--- a/common/strutils.h
+++ b/common/strutils.h
@@ -6,47 +6,17 @@
 #include "aloptional.h"
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-
-inline std::string wstr_to_utf8(const WCHAR *wstr)
-{
-    std::string ret;
-
-    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
-    if(len > 0)
-    {
-        ret.resize(len);
-        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &ret[0], len, nullptr, nullptr);
-        ret.pop_back();
-    }
-
-    return ret;
-}
-
-inline std::wstring utf8_to_wstr(const char *str)
-{
-    std::wstring ret;
-
-    int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
-    if(len > 0)
-    {
-        ret.resize(len);
-        MultiByteToWideChar(CP_UTF8, 0, str, -1, &ret[0], len);
-        ret.pop_back();
-    }
-
-    return ret;
-}
+#include <wchar.h>
 
+std::string wstr_to_utf8(const wchar_t *wstr);
+std::wstring utf8_to_wstr(const char *str);
 #endif
 
 namespace al {
 
 al::optional<std::string> getenv(const char *envname);
 #ifdef _WIN32
-al::optional<std::wstring> getenv(const WCHAR *envname);
+al::optional<std::wstring> getenv(const wchar_t *envname);
 #endif
 
 } // namespace al