diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-09 11:02:54 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-09 11:02:54 +0000 |
| commit | 1753d37fc714f2eb387689140016908845d5af3f (patch) | |
| tree | b887a27980a90e3f41413b974e740a6605e446d5 | |
| parent | 3c189b6940d304770c2d7610b5d6704d613d6b5f (diff) | |
| download | mpv-1753d37fc714f2eb387689140016908845d5af3f.tar.bz2 mpv-1753d37fc714f2eb387689140016908845d5af3f.tar.xz | |
Merge two preprocessor conditions in order to drop one duplicated #else case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28902 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/fastmemcpy.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index fa736b62f0..16767d9842 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -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 |