summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/strconv.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 11:31:49 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 11:31:49 +0200
commit23ad94073f4c2f7131fa0c95b6202f2f9027db41 (patch)
tree4f4e1e27a22ace8fea49b63030d4462db7cb68a1 /src/osd/strconv.cpp
parent255bf78b316a9dc9e4c53a65143000471a6927d3 (diff)
use standard types uintptr_t, char16_t and char32_t instead of FPTR, utf16_char, unicode_char (nw)
Diffstat (limited to 'src/osd/strconv.cpp')
-rw-r--r--src/osd/strconv.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp
index 25d651fcf5b..8759f67cce9 100644
--- a/src/osd/strconv.cpp
+++ b/src/osd/strconv.cpp
@@ -282,7 +282,7 @@ std::string from_wstring(const WCHAR *s)
// osd_uchar_from_osdchar
//============================================================
-int osd_uchar_from_osdchar(UINT32 *uchar, const char *osdchar, size_t count)
+int osd_uchar_from_osdchar(char32_t *uchar, const char *osdchar, size_t count)
{
WCHAR wch;
CPINFO cp;
@@ -311,7 +311,7 @@ error:
// osd_uchar_from_osdchar
//============================================================
-int osd_uchar_from_osdchar(unicode_char *uchar, const char *osdchar, size_t count)
+int osd_uchar_from_osdchar(char32_t *uchar, const char *osdchar, size_t count)
{
wchar_t wch;