From ec78117269461b2cdce15a085033a8c6bff6d7e3 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 15 Dec 2024 16:24:12 +0100
Subject: [PATCH] Fixed conversion between utf-8 and utf-16 for Windows build

---
 src/common/str-utils.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/str-utils.cpp b/src/common/str-utils.cpp
index 245e31e1f3..44bb0087ab 100644
--- a/src/common/str-utils.cpp
+++ b/src/common/str-utils.cpp
@@ -185,14 +185,14 @@ is_slash(char c)
 std::wstring
 wstr_from_utf8(const char *s)
 {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8conv;
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> utf8conv;
     return utf8conv.from_bytes(s);
 }
 
 std::wstring
 wstr_from_utf8(const char *first, const char *last)
 {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8conv;
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> utf8conv;
     return utf8conv.from_bytes(first, last);
 }
 
@@ -205,7 +205,7 @@ wstr_from_utf8(const std::string &s)
 std::string
 wstr_to_utf8(const wchar_t *ws)
 {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8conv;
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> utf8conv;
     return utf8conv.to_bytes(ws);
 }