From b32478f237d5e590e4714ee52ab5ce96206bae05 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 20 Dec 2004 21:22:18 +0000 Subject: remove all local names beginning with double underscore, because C99 reserves these names for use by the C implementation CVS patchset: 7288 CVS date: 2004/12/20 21:22:18 --- src/xine-utils/memcpy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/xine-utils/memcpy.c') diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index c90322848..ee86b3759 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -133,7 +133,7 @@ __asm__ __volatile__(\ } /* linux kernel __memcpy (from: /include/asm/string.h) */ -static __inline__ void * __memcpy ( +static __inline__ void * linux_kernel_memcpy_impl ( void * to, const void * from, size_t n) @@ -253,7 +253,7 @@ static void * sse_memcpy(void * to, const void * from, size_t len) /* * Now do the tail of the block */ - if(len) __memcpy(to, from, len); + if(len) linux_kernel_memcpy_impl(to, from, len); return retval; } @@ -304,7 +304,7 @@ static void * mmx_memcpy(void * to, const void * from, size_t len) /* * Now do the tail of the block */ - if(len) __memcpy(to, from, len); + if(len) linux_kernel_memcpy_impl(to, from, len); return retval; } @@ -374,12 +374,12 @@ static void * mmx2_memcpy(void * to, const void * from, size_t len) /* * Now do the tail of the block */ - if(len) __memcpy(to, from, len); + if(len) linux_kernel_memcpy_impl(to, from, len); return retval; } static void *linux_kernel_memcpy(void *to, const void *from, size_t len) { - return __memcpy(to,from,len); + return linux_kernel_memcpy_impl(to,from,len); } #endif /* _MSC_VER */ #endif /* ARCH_X86 */ -- cgit v1.2.3