# HG changeset patch
# User diego
# Date 1236596574 0
# Node ID c7ac52e4b228e45297b1ff81c8f347bdc590ae94
# Parent  e73c3b5d724a0a99a61f7f060750c4c87cd89888
Merge two preprocessor conditions in order to drop one duplicated #else case.

diff -r e73c3b5d724a -r c7ac52e4b228 libvo/fastmemcpy.h
--- a/libvo/fastmemcpy.h	Mon Mar 09 10:14:11 2009 +0000
+++ b/libvo/fastmemcpy.h	Mon Mar 09 11:02:54 2009 +0000
@@ -23,20 +23,13 @@
 #include <inttypes.h>
 #include <string.h>
 
-#ifdef CONFIG_FASTMEMCPY
-#if HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW \
-/*    || HAVE_SSE || HAVE_SSE2 */
+#if defined(CONFIG_FASTMEMCPY) && (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */)
 #include <stddef.h>
 
 void * fast_memcpy(void * to, const void * from, size_t len);
 void * mem2agpcpy(void * to, const void * from, size_t len);
 
-#else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */
-#define mem2agpcpy(a,b,c) memcpy(a,b,c)
-#define fast_memcpy(a,b,c) memcpy(a,b,c)
-#endif
-
-#else /* CONFIG_FASTMEMCPY */
+#else
 #define mem2agpcpy(a,b,c) memcpy(a,b,c)
 #define fast_memcpy(a,b,c) memcpy(a,b,c)
 #endif