Merge branch 'mingw-w64-warn-fixes'

Fix a few (harmless) warnings when building with gcc 8 from MinGW-w64.

See https://github.com/wxWidgets/wxWidgets/pull/854
This commit is contained in:
Vadim Zeitlin
2018-07-24 15:12:26 +02:00
5 changed files with 118 additions and 77 deletions

View File

@@ -257,7 +257,7 @@ inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
{
if ( n-- > len )
n = len;
wxCRT_StrncpyA(dest, src, n);
wxTmemcpy(dest, src, n);
dest[n] = '\0';
}
@@ -270,7 +270,7 @@ inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n)
{
if ( n-- > len )
n = len;
wxCRT_StrncpyW(dest, src, n);
wxTmemcpy(dest, src, n);
dest[n] = L'\0';
}