1.1 --- a/xen/common/string.c	Tue Nov 11 09:29:57 2003 +0000
     1.2 +++ b/xen/common/string.c	Tue Nov 11 12:10:54 2003 +0000
     1.3 @@ -391,7 +391,6 @@ char * bcopy(const char * src, char * de
     1.4  }
     1.5  #endif
     1.6  
     1.7 -#ifndef __HAVE_ARCH_MEMCPY
     1.8  /**
     1.9   * memcpy - Copy one area of memory to another
    1.10   * @dest: Where to copy to
    1.11 @@ -401,6 +400,7 @@ char * bcopy(const char * src, char * de
    1.12   * You should not use this function to access IO space, use memcpy_toio()
    1.13   * or memcpy_fromio() instead.
    1.14   */
    1.15 +#undef memcpy
    1.16  void * memcpy(void * dest,const void *src,size_t count)
    1.17  {
    1.18  	char *tmp = (char *) dest, *s = (char *) src;
    1.19 @@ -410,7 +410,6 @@ void * memcpy(void * dest,const void *sr
    1.20  
    1.21  	return dest;
    1.22  }
    1.23 -#endif
    1.24  
    1.25  #ifndef __HAVE_ARCH_MEMMOVE
    1.26  /**