Mercurial > mplayer.hg
changeset 28867:c7ac52e4b228
Merge two preprocessor conditions in order to drop one duplicated #else case.
| author | diego |
|---|---|
| date | Mon, 09 Mar 2009 11:02:54 +0000 |
| parents | e73c3b5d724a |
| children | a10ddae3de31 |
| files | libvo/fastmemcpy.h |
| diffstat | 1 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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