diff options
author | Austin Clements <[email protected]> | 2009-10-07 13:06:55 -0400 |
---|---|---|
committer | Austin Clements <[email protected]> | 2009-10-07 13:06:55 -0400 |
commit | 2c536bff67ed209b1c5aa3d40e40731813bfcd9a (patch) | |
tree | 99d5dfaa402c65f97218b7aa4195f373090e4795 | |
parent | 6639ce56d986cdae197e4f013dde536178ad23f8 (diff) | |
download | xv6-labs-2c536bff67ed209b1c5aa3d40e40731813bfcd9a.tar.gz xv6-labs-2c536bff67ed209b1c5aa3d40e40731813bfcd9a.tar.bz2 xv6-labs-2c536bff67ed209b1c5aa3d40e40731813bfcd9a.zip |
Remove memcpy prototypes at Russ' request to prevent code from calling
memcpy directly.
-rw-r--r-- | defs.h | 1 | ||||
-rw-r--r-- | string.c | 1 | ||||
-rw-r--r-- | user.h | 1 |
3 files changed, 1 insertions, 2 deletions
@@ -124,7 +124,6 @@ void popcli(); // string.c int memcmp(const void*, const void*, uint); void* memmove(void*, const void*, uint); -void* memcpy(void*, const void*, uint); void* memset(void*, int, uint); char* safestrcpy(char*, const char*, int); int strlen(const char*); @@ -44,6 +44,7 @@ memmove(void *dst, const void *src, uint n) return dst; } +// memcpy exists to placate GCC. Use memmove. void* memcpy(void *dst, const void *src, uint n) { @@ -26,7 +26,6 @@ int sleep(int); int stat(char*, struct stat*); char* strcpy(char*, char*); void *memmove(void*, void*, int); -void *memcpy(void*, void*, int); char* strchr(const char*, char c); int strcmp(const char*, const char*); void printf(int, char*, ...); |