Index: include/memstr.h
===================================================================
--- include/memstr.h	(revision d9430f782ca220b5250e91b44bd57d3fd4b74894)
+++ include/memstr.h	(revision a2dc632e6da60e8ea940ffe7cc303e665b699e8b)
@@ -38,9 +38,10 @@
 
 extern int memcmp(__address src, __address dst, int cnt);
+extern void *memcpy(void *dst, const void *src, size_t cnt);
 
 /*
  * Architecture independent variants.
  */
-extern char *_memcpy(void *dst, const void *src, size_t cnt);
+extern void *_memcpy(void *dst, const void *src, size_t cnt);
 extern void _memsetb(__address dst, size_t cnt, __u8 x);
 extern void _memsetw(__address dst, size_t cnt, __u16 x);
Index: src/lib/memstr.c
===================================================================
--- src/lib/memstr.c	(revision d9430f782ca220b5250e91b44bd57d3fd4b74894)
+++ src/lib/memstr.c	(revision a2dc632e6da60e8ea940ffe7cc303e665b699e8b)
@@ -42,5 +42,5 @@
  *
  */
-char *_memcpy(void * dst, const void *src, size_t cnt)
+void *_memcpy(void * dst, const void *src, size_t cnt)
 {
 	int i;