[PATCH] include: Fix compile error with C++ winelib.
Daniel Lehman
dlehman25 at gmail.com
Wed Feb 19 01:01:27 CST 2020
Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
---
/home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h: In function 'wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t)':
/home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h:529:18: error: invalid conversion from 'void*' to 'wchar_t*' [-fpermissive]
return memcpy(dst, src, n * sizeof(wchar_t));
~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h: In function 'wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t)':
/home/me/stuff/wine/64/output/include/wine/msvcrt/wchar.h:534:19: error: invalid conversion from 'void*' to 'wchar_t*' [-fpermissive]
return memmove(dst, src, n * sizeof(wchar_t));
~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
include/msvcrt/wchar.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index 119f8a2a41..e6a5e57fd2 100644
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -421,12 +421,12 @@ static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n)
static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t n)
{
- return memcpy(dst, src, n * sizeof(wchar_t));
+ return (wchar_t*)memcpy(dst, src, n * sizeof(wchar_t));
}
static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n)
{
- return memmove(dst, src, n * sizeof(wchar_t));
+ return (wchar_t*)memmove(dst, src, n * sizeof(wchar_t));
}
static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n)
--
2.17.1
More information about the wine-devel
mailing list