summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-06 13:35:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-06 13:35:12 (GMT)
commit7b6d53fa3bc9dbcc23c4b6cad4bf7e9d30a61eaa (patch)
tree3ec0013919a786a5184a1ee5b77459c9091b1da8 /compat
parente352e2b742b841376c7bfdc0c12cb5d198869a50 (diff)
parentec01eef200318de0c4ec4236258febc61e836b58 (diff)
downloadtcl-7b6d53fa3bc9dbcc23c4b6cad4bf7e9d30a61eaa.zip
tcl-7b6d53fa3bc9dbcc23c4b6cad4bf7e9d30a61eaa.tar.gz
tcl-7b6d53fa3bc9dbcc23c4b6cad4bf7e9d30a61eaa.tar.bz2
Merge 8.7
Diffstat (limited to 'compat')
-rw-r--r--compat/string.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/compat/string.h b/compat/string.h
index 42be10c..aa889f2 100644
--- a/compat/string.h
+++ b/compat/string.h
@@ -21,19 +21,15 @@
#include <sys/types.h>
-#ifdef __APPLE__
extern void * memchr(const void *s, int c, size_t n);
-#else
-extern char * memchr(const void *s, int c, size_t n);
-#endif
extern int memcmp(const void *s1, const void *s2, size_t n);
-extern char * memcpy(void *t, const void *f, size_t n);
+extern void * memcpy(void *t, const void *f, size_t n);
#ifdef NO_MEMMOVE
#define memmove(d,s,n) (bcopy((s), (d), (n)))
#else
extern char * memmove(void *t, const void *f, size_t n);
#endif
-extern char * memset(void *s, int c, size_t n);
+extern void * memset(void *s, int c, size_t n);
extern int strcasecmp(const char *s1, const char *s2);
extern char * strcat(char *dst, const char *src);