Merge pull request #627 from thepyper/master

Merge PR #627: musl support
This commit is contained in:
Ilya Shipitsin authored and GitHub committed 2018-08-12 19:08:30 +05:00
commit c398459ebf
2 files changed
+6 -3

No files matched your search

+3 -3
View File
@@ -789,11 +789,11 @@ void InitInternational()
d = IconvWideToStrInternal();
if (d == (void *)-1)
{
#ifdef UNIX_MACOS
#if defined (UNIX_MACOS) || defined (UNIX_LINUX_MUSL)
StrCpy(charset, sizeof(charset), "utf-8");
#else // UNIX_MACOS
#else // defined (UNIX_MACOS) || defined (UNIX_LINUX_MUSL)
StrCpy(charset, sizeof(charset), "EUCJP");
#endif // UNIX_MACOS
#endif // defined (UNIX_MACOS) || defined (UNIX_LINUX_MUSL)
d = IconvWideToStrInternal();
if (d == (void *)-1)
{