# HG changeset patch # User astrange # Date 1273569811 0 # Node ID 5b23259d86e7ad14c7a3702fdcaa0ecb78ab3875 # Parent 0a999f052474c42a052c8070c4690b97edc6a893 Fix compilation with --disable-fastmemcpy on x86 The inverse of a && b isn't !a && !b. Regression in r30728. diff -r 0a999f052474 -r 5b23259d86e7 libvo/fastmemcpy.h --- 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