changeset 30686:688c1e685fe7

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'
author diego
date Thu, 25 Feb 2010 13:20:56 +0000
parents 7e2f58933cc1
children 6cef34c73074
files libvo/fastmemcpy.h
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/fastmemcpy.h	Thu Feb 25 09:09:57 2010 +0000
+++ b/libvo/fastmemcpy.h	Thu Feb 25 13:20:56 2010 +0000
@@ -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