From 9b2e480278d36c4d7b6f988621a3a9f699cc730f Mon Sep 17 00:00:00 2001 From: SSE4 Date: Wed, 10 Jul 2019 03:55:56 -0700 Subject: [PATCH 2/2] - memmove is intrinsic function on MSVC Signed-off-by: SSE4 --- gettext-runtime/gnulib-lib/memmove.c | 4 ++++ gettext-tools/gnulib-lib/memmove.c | 4 ++++ gettext-tools/gnulib-lib/memset.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/gettext-runtime/gnulib-lib/memmove.c b/gettext-runtime/gnulib-lib/memmove.c index 0f040540c..bc8883ae4 100644 --- a/gettext-runtime/gnulib-lib/memmove.c +++ b/gettext-runtime/gnulib-lib/memmove.c @@ -7,6 +7,8 @@ #include +#ifndef _MSC_VER + void * memmove (void *dest0, void const *source0, size_t length) { @@ -24,3 +26,5 @@ memmove (void *dest0, void const *source0, size_t length) } return dest0; } + +#endif diff --git a/gettext-tools/gnulib-lib/memmove.c b/gettext-tools/gnulib-lib/memmove.c index 0f040540c..bc8883ae4 100644 --- a/gettext-tools/gnulib-lib/memmove.c +++ b/gettext-tools/gnulib-lib/memmove.c @@ -7,6 +7,8 @@ #include +#ifndef _MSC_VER + void * memmove (void *dest0, void const *source0, size_t length) { @@ -24,3 +26,5 @@ memmove (void *dest0, void const *source0, size_t length) } return dest0; } + +#endif diff --git a/gettext-tools/gnulib-lib/memset.c b/gettext-tools/gnulib-lib/memset.c index 4e60124e7..b595fa966 100644 --- a/gettext-tools/gnulib-lib/memset.c +++ b/gettext-tools/gnulib-lib/memset.c @@ -18,6 +18,8 @@ #include +#ifndef _MSC_VER + void * memset (void *str, int c, size_t len) { @@ -27,3 +29,5 @@ memset (void *str, int c, size_t len) *st++ = c; return str; } + +#endif -- 2.21.0.windows.1