summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-25 13:20:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-25 13:20:56 +0000
commit2074d1a3e7c3866f25a0e5cfb60025dd44cc7f89 (patch)
treef5739183492a3f2a6750b18d190d2481bdde90eb /libvo
parent16d8b08089a0a99c2f6e4b667cad899d7ac1e950 (diff)
downloadmpv-2074d1a3e7c3866f25a0e5cfb60025dd44cc7f89.tar.bz2
mpv-2074d1a3e7c3866f25a0e5cfb60025dd44cc7f89.tar.xz
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' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30728 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/fastmemcpy.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index 16767d9842..a28f495486 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -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