--- 2.3.99-pre7-pre3-VM-alpha/include/asm-alpha/string.h.~1~	Tue Sep 14 14:33:21 1999
+++ 2.3.99-pre7-pre3-VM-alpha/include/asm-alpha/string.h	Wed May  3 17:16:38 2000
@@ -11,7 +11,6 @@
  */
 
 #define __HAVE_ARCH_MEMCPY
-#define __HAVE_ARCH_MEMMOVE
 /* For backward compatibility with modules.  Unused otherwise.  */
 extern void * __memcpy(void *, const void *, size_t);
 
@@ -19,6 +18,9 @@
 #define memcpy __builtin_memcpy
 #endif
 
+#define __HAVE_ARCH_MEMMOVE
+extern void * memmove(void *,const void *,__kernel_size_t);
+
 #define __HAVE_ARCH_MEMSET
 extern void * __constant_c_memset(void *, unsigned long, size_t);
 extern void * __memset(void *, int, size_t);
@@ -38,13 +40,21 @@
 #endif
 
 #define __HAVE_ARCH_STRCPY
+extern char * strcpy(char *,const char *);
 #define __HAVE_ARCH_STRNCPY
+extern char * strncpy(char *,const char *, __kernel_size_t);
 #define __HAVE_ARCH_STRCAT
+extern char * strcat(char *, const char *);
 #define __HAVE_ARCH_STRNCAT
+extern char * strncat(char *, const char *, __kernel_size_t);
 #define __HAVE_ARCH_STRCHR
+extern char * strchr(const char *,int);
 #define __HAVE_ARCH_STRRCHR
+extern char * strrchr(const char *,int);
 #define __HAVE_ARCH_STRLEN
+extern __kernel_size_t strlen(const char *);
 #define __HAVE_ARCH_MEMCHR
+extern void * memchr(const void *,int,__kernel_size_t);
 
 /* The following routine is like memset except that it writes 16-bit
    aligned values.  The DEST and COUNT parameters must be even for