From 5c669730a9773624313f82fe1ba3004cf551846b Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Fri, 5 Nov 2021 16:55:23 +0900 Subject: [PATCH] Re-defined iswprint() using GetStringTypeW on windows. --- src/tuxpaint.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 5f5b14517..cee495092 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -328,6 +328,7 @@ typedef struct safer_dirent /* Windows */ +#include #include #include #include @@ -336,6 +337,9 @@ typedef struct safer_dirent #include #include +#undef min +#undef max + #define mkdir(path,access) _mkdir(path) static void mtw(wchar_t * wtok, char *tok, size_t size) @@ -365,6 +369,14 @@ static void mtw(wchar_t * wtok, char *tok, size_t size) extern int win32_trash(const char *path); #endif +#undef iswprint +int iswprint(wchar_t wc) +{ + WORD t; + GetStringTypeW(CT_CTYPE1, &wc, 1, &t); + return (t & C1_DEFINED) && !(t & C1_CNTRL); +} + #endif /* WIN32 */ #if defined(__MACOS__)