summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-07-18 18:16:17 (GMT)
committerericm <ericm>2000-07-18 18:16:17 (GMT)
commit25ae774988b1ff08384886cc62c07f67a0d1d979 (patch)
tree022b0da20d675961a69de89d8119ba475848c4b5
parent9a65c2caeb04cecfe5f19cc12ae598fcc2c8645c (diff)
downloadtcl-25ae774988b1ff08384886cc62c07f67a0d1d979.zip
tcl-25ae774988b1ff08384886cc62c07f67a0d1d979.tar.gz
tcl-25ae774988b1ff08384886cc62c07f67a0d1d979.tar.bz2
* compat/string.h: Fixed function prototypes for strpbrk and
strtok [Bug: 6020].
-rw-r--r--ChangeLog5
-rw-r--r--compat/string.h7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a709a7a..a442b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18 Eric Melski <ericm@scriptics.com>
+
+ * compat/string.h: Fixed function prototypes for strpbrk and
+ strtok [Bug: 6020].
+
2000-07-17 David Gravereaux <davygrvy@ajubasolutions.com>
* win/tclWinChan.c: Win2K OS bug with
diff --git a/compat/string.h b/compat/string.h
index b7a0653..37e5140 100644
--- a/compat/string.h
+++ b/compat/string.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: string.h,v 1.3 1999/04/16 00:46:30 stanton Exp $
+ * RCS: @(#) $Id: string.h,v 1.4 2000/07/18 18:16:17 ericm Exp $
*/
#ifndef _STRING
@@ -59,12 +59,13 @@ extern int strncmp _ANSI_ARGS_((CONST char *s1, CONST char *s2,
size_t nChars));
extern char * strncpy _ANSI_ARGS_((char *dst, CONST char *src,
size_t numChars));
-extern char * strpbrk _ANSI_ARGS_((CONST char *string, char *chars));
+extern char * strpbrk _ANSI_ARGS_((CONST char *string,
+ CONST char *chars));
extern char * strrchr _ANSI_ARGS_((CONST char *string, int c));
extern size_t strspn _ANSI_ARGS_((CONST char *string,
CONST char *chars));
extern char * strstr _ANSI_ARGS_((CONST char *string,
CONST char *substring));
-extern char * strtok _ANSI_ARGS_((CONST char *s, CONST char *delim));
+extern char * strtok _ANSI_ARGS_((char *s, CONST char *delim));
#endif /* _STRING */