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

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2003-11-18 14:34:18 +00:00
parent 6874cb465a
commit fbcac5f129
3 changed files with 17 additions and 7 deletions

View File

@ -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> Tue Nov 18 22:20:10 2003 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (fu_same?): temporal fix for windows. * lib/fileutils.rb (fu_same?): temporal fix for windows.

View File

@ -74,7 +74,7 @@ extern int memcmp _((char *, char *, int));
*/ */
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
extern char *memmove _((char *, char *, int)); extern void *memmove _((void *, void *, int));
#endif #endif
#ifndef HAVE_MKDIR #ifndef HAVE_MKDIR
@ -96,8 +96,8 @@ extern int strncasecmp _((char *, char *, int));
#endif #endif
#ifndef HAVE_STRCHR #ifndef HAVE_STRCHR
extern int strchr _((char *, int)); extern char *strchr _((char *, int));
extern int strrchr _((char *, int)); extern char *strrchr _((char *, int));
#endif #endif
#ifndef HAVE_STRERROR #ifndef HAVE_STRERROR

View File

@ -1,11 +1,13 @@
/* public domain rewrite of memcmp(3) */ /* public domain rewrite of memcmp(3) */
char * void *
memmove (dst, src, n) memmove (d, s, n)
char *dst, *src; void *d, *s;
int n; int n;
{ {
char *ret = dst; char *dst = d;
char *src = s;
void *ret = dst;
if (src < dst) { if (src < dst) {
src += n; src += n;