From f845d9e4e0bd500b23a36d85f6c27c23ff4abd3e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 10 Nov 2016 16:32:26 -0800 Subject: [PATCH] builtin_{memcpy,memset}: make compatible with libc 1. memcpy() last argument is size_t 2. memset() returns void * Make our builtin_*() functions compatible. https://travis-ci.org/kolyshkin/criu/builds/174634847 Signed-off-by: Kir Kolyshkin Reviewed-by: Dmitry Safonov Signed-off-by: Pavel Emelyanov --- criu/include/asm-generic/string.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/criu/include/asm-generic/string.h b/criu/include/asm-generic/string.h index df53e666c..1448a3200 100644 --- a/criu/include/asm-generic/string.h +++ b/criu/include/asm-generic/string.h @@ -4,9 +4,9 @@ #include "common/compiler.h" #ifndef HAS_BUILTIN_MEMCPY -static always_inline void *builtin_memcpy(void *to, const void *from, unsigned int n) +static always_inline void *builtin_memcpy(void *to, const void *from, size_t n) { - int i; + size_t i; unsigned char *cto = to; const unsigned char *cfrom = from; @@ -47,13 +47,15 @@ static always_inline int builtin_strncmp(const char *cs, const char *ct, size_t #endif #ifndef HAS_BUILTIN_MEMSET -static always_inline void builtin_memset(void *s, const int c, size_t count) +static always_inline void *builtin_memset(void *s, const int c, size_t count) { char *dest = s; size_t i = 0; while (i < count) dest[i++] = (char) c; + + return s; } #endif