[MPlayer-cvslog] r30728 - trunk/libvo/fastmemcpy.h

[diego]

Author: diego
Date: Thu Feb 25 14:20:56 2010
New Revision: 30728

Log:
Unconditionally declare fast_memcpy() and mem2agpcpy().
This fixes the following warnings on non-x86 systems:
libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy'
libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy'

Modified:
   trunk/libvo/fastmemcpy.h

Modified: trunk/libvo/fastmemcpy.h
==============================================================================
--- trunk/libvo/fastmemcpy.h	Thu Feb 25 10:09:57 2010	(r30727)
+++ trunk/libvo/fastmemcpy.h	Thu Feb 25 14:20:56 2010	(r30728)
@@ -22,14 +22,12 @@
 #include "config.h"
 #include <inttypes.h>
 #include <string.h>
-
-#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
+#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