Mercurial > mplayer.hg
changeset 31097:5b23259d86e7
Fix compilation with --disable-fastmemcpy on x86
The inverse of a && b isn't !a && !b.
Regression in r30728.
| author | astrange |
|---|---|
| date | Tue, 11 May 2010 09:23:31 +0000 |
| parents | 0a999f052474 |
| children | 9e9595c779cf |
| files | libvo/fastmemcpy.h |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/fastmemcpy.h Tue May 11 00:36:34 2010 +0000 +++ b/libvo/fastmemcpy.h Tue May 11 09:23:31 2010 +0000 @@ -27,7 +27,7 @@ void * fast_memcpy(void * to, const void * from, size_t len); void * mem2agpcpy(void * to, const void * from, size_t len); -#if ! defined(CONFIG_FASTMEMCPY) && ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) +#if ! defined(CONFIG_FASTMEMCPY) || ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #define mem2agpcpy(a,b,c) memcpy(a,b,c) #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif