Skip to content

W
wine-winehq
Commit a2034215 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Don't build memcpy_unaligned on 386 to avoid MSVC breakage (reported

by Jon Griffiths).
parent 31d4a7c4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
include/wine/port.h
View file @ a2034215
...@@ -258,7 +258,7 @@ int usleep (unsigned int useconds); ...@@ -258,7 +258,7 @@ int usleep (unsigned int useconds);
#endif /* !defined(HAVE_USLEEP) */ #endif /* !defined(HAVE_USLEEP) */
#ifdef __i386__ #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 ); return memcpy( dst, src, size );
} }
......
libs/port/memcpy_unaligned.c
View file @ a2034215
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#ifndef __i386__
void *memcpy_unaligned( void *dst, const void *src, size_t size ) void *memcpy_unaligned( void *dst, const void *src, size_t size )
{ {
return memcpy( dst, src, size ); return memcpy( dst, src, size );
} }
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment