From a20342158122deff2962505bb7f35739b3bbc2df Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 25 Aug 2003 23:45:34 +0000 Subject: [PATCH] Don't build memcpy_unaligned on 386 to avoid MSVC breakage (reported by Jon Griffiths). --- include/wine/port.h | 2 +- libs/port/memcpy_unaligned.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wine/port.h b/include/wine/port.h index 28c16238bf3..90c3798fd53 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -258,7 +258,7 @@ int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ #ifdef __i386__ -extern inline void *memcpy_unaligned( void *dst, const void *src, size_t size ) +static inline void *memcpy_unaligned( void *dst, const void *src, size_t size ) { return memcpy( dst, src, size ); } diff --git a/libs/port/memcpy_unaligned.c b/libs/port/memcpy_unaligned.c index e2a1f629669..62a9ec0d821 100644 --- a/libs/port/memcpy_unaligned.c +++ b/libs/port/memcpy_unaligned.c @@ -21,7 +21,9 @@ #include "config.h" #include "wine/port.h" +#ifndef __i386__ void *memcpy_unaligned( void *dst, const void *src, size_t size ) { return memcpy( dst, src, size ); } +#endif