romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-16 08:27:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

multibyte: limit curlx_convert_*wchar*() functions to Unicode builds

Browse source 
Follow-up to ccb68d2e3b #19790

Closes #19796
This commit is contained in:
Viktor Szakats 2025-12-01 20:08:09 +01:00
parent 189fda0026
commit 9517b41b50
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/curlx/multibyte.c
View file

@ -29,7 +29,7 @@
#include "../curl_setup.h"
#ifdef _WIN32
#if defined(_WIN32) && defined(UNICODE)
#include "multibyte.h"
@ -81,4 +81,4 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w)
return str_utf8;
}
#endif /* _WIN32 */
#endif /* _WIN32 && UNICODE */

8
lib/curlx/multibyte.h
View file

@ -52,15 +52,15 @@
#define CURLX_FREE(x) curlx_free(x)
#endif
/* MultiByte conversions using Windows kernel32 library. */
wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8);
char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w);
/* the purpose of this macro is to free() without being traced by memdebug */
#define curlx_unicodefree(ptr) CURLX_FREE(ptr)
#ifdef UNICODE
/* MultiByte conversions using Windows kernel32 library. */
wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8);
char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w);
#define curlx_convert_UTF8_to_tchar(ptr) curlx_convert_UTF8_to_wchar((ptr))
#define curlx_convert_tchar_to_UTF8(ptr) curlx_convert_wchar_to_UTF8((ptr))