From 9ac35085f5760b63fd4a38c48f2a9d906d9c4b26 Mon Sep 17 00:00:00 2001 From: astrange Date: Tue, 11 May 2010 09:23:31 +0000 Subject: [PATCH] Fix compilation with --disable-fastmemcpy on x86 The inverse of a && b isn't !a && !b. Regression in r30728. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/fastmemcpy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index a28f495486..f03287564f 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -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