* missing/memmove.c (memmove): take void *, not char *.

* missing.h (memmove): ditto.
* missing.h (strchr, strrchr): return char *, not int.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 17 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index c5ccac1af..8f7bd695d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov 18 23:31:36 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing/memmove.c (memmove): take void *, not char *.
+
+	* missing.h (memmove): ditto.
+
+	* missing.h (strchr, strrchr): return char *, not int.
+
 Tue Nov 18 22:20:10 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (fu_same?): temporal fix for windows.
diff --git a/missing.h b/missing.h
index 133f1fc68..f3339f320 100644
--- a/missing.h
+++ b/missing.h
@@ -74,7 +74,7 @@ extern int memcmp _((char *, char *, int));
 */
 
 #ifndef HAVE_MEMMOVE
-extern char *memmove _((char *, char *, int));
+extern void *memmove _((void *, void *, int));
 #endif
 
 #ifndef HAVE_MKDIR
@@ -96,8 +96,8 @@ extern int strncasecmp _((char *, char *, int));
 #endif
 
 #ifndef HAVE_STRCHR
-extern int strchr _((char *, int));
-extern int strrchr _((char *, int));
+extern char *strchr _((char *, int));
+extern char *strrchr _((char *, int));
 #endif
 
 #ifndef HAVE_STRERROR
diff --git a/missing/memmove.c b/missing/memmove.c
index 7961c5c0e..c9d67d8b4 100644
--- a/missing/memmove.c
+++ b/missing/memmove.c
@@ -1,11 +1,13 @@
 /* public domain rewrite of memcmp(3) */
 
-char *
-memmove (dst, src, n)
-    char *dst, *src;
+void *
+memmove (d, s, n)
+    void *d, *s;
     int n;
 {
-    char *ret = dst;
+    char *dst = d;
+    char *src = s;
+    void *ret = dst;
 
     if (src < dst) {
 	src += n;