[MPlayer-cvslog] r31154 - trunk/libvo/fastmemcpy.h
astrange
subversion at mplayerhq.hu
Tue May 11 11:23:32 CEST 2010
Author: astrange
Date: Tue May 11 11:23:31 2010
New Revision: 31154
Log:
Fix compilation with --disable-fastmemcpy on x86
The inverse of a && b isn't !a && !b.
Regression in r30728.
Modified:
trunk/libvo/fastmemcpy.h
Modified: trunk/libvo/fastmemcpy.h
==============================================================================
--- trunk/libvo/fastmemcpy.h Tue May 11 02:36:34 2010 (r31153)
+++ trunk/libvo/fastmemcpy.h Tue May 11 11:23:31 2010 (r31154)
@@ -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
More information about the MPlayer-cvslog
mailing list