From d200f19c02e8454bd764ab2c808af225edaa48ae Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 22 Aug 2018 08:12:11 -0700 Subject: [PATCH] Fix non-unicode build after 82881d6b03 wxChar overload of wxTmemcpy() is not defined. Just use memcpy() directly as wxStrlcpy() does not use wxChar. --- include/wx/wxcrt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 1a3e5e0dbf..fc3bf0b681 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -257,7 +257,7 @@ inline size_t wxStrlcpy(char *dest, const char *src, size_t n) { if ( n-- > len ) n = len; - wxTmemcpy(dest, src, n); + memcpy(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; - wxTmemcpy(dest, src, n); + memcpy(dest, src, n * sizeof(wchar_t)); dest[n] = L'\0'; }