Index: include/memory.h
===================================================================
--- include/memory.h	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
+++ include/memory.h	(revision 0292fbb837057344b92e839b5e70c803241f361b)
@@ -6,10 +6,10 @@
 */
 
-extern	char	*memccpy(char *s1, char *s2, char c, int n);
-extern	char	*memchr(char *sp, char c, int n);
-extern	char	*memcpy(char *s1, char *s2, int n);
-extern	char	*memset(char *sp, char c, int n);
-extern	int	memcmp(char *s1, char *s2, int n);
-extern	short	*memsetw(short *sp, short w, short n);
-extern	short	*memcpyw(short *s1, short *s2, int n);
-extern	int	memcmpu(char *s1, char *s2, int n);
+extern	void	*memccpy(void *vp1, void *vp2, char c, int n);
+extern	void	*memchr(void *vp, char c, int n);
+extern	void	*memcpy(void *vp1, void *vp2, int n);
+extern	void	*memset(void *vp, char c, int n);
+extern	int	memcmp(void *vp1, void *vp2, int n);
+extern	void	*memsetw(void *vp, short s, short n);
+extern	void	*memcpyw(void *vp1, void *vp2, int n);
+extern	int	memcmpu(void *vp1, void *vp2, int n);