diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-18 14:34:18 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-18 14:34:18 +0000 |
| commit | fbcac5f129bed8a9df4174f554ee018695e8c040 (patch) | |
| tree | 8966ee89919ced2561844246d5c79d95f6f9e77b | |
| parent | 6874cb465a1a8193a64d946d1bdb7ff4756a7ed9 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | missing.h | 6 | ||||
| -rw-r--r-- | missing/memmove.c | 10 |
3 files changed, 17 insertions, 7 deletions
@@ -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. @@ -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 7961c5c0e6..c9d67d8b45 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; |