diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 11:26:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 11:26:40 (GMT) |
| commit | 33781b4f56a17a08c2a610101656daed7b75a346 (patch) | |
| tree | ed14d5f0bca9e157b3211c4944dd426a63a1a730 /compat | |
| parent | dbab2685a152edb53d27b36096f264e30a6c051e (diff) | |
| parent | 53a1c724ce9fb550d72eb58cf3599411674da0c2 (diff) | |
| download | tcl-33781b4f56a17a08c2a610101656daed7b75a346.zip tcl-33781b4f56a17a08c2a610101656daed7b75a346.tar.gz tcl-33781b4f56a17a08c2a610101656daed7b75a346.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/strstr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compat/strstr.c b/compat/strstr.c index 206dca9..35386d0 100644 --- a/compat/strstr.c +++ b/compat/strstr.c @@ -36,10 +36,10 @@ char * strstr( - char *string, /* String to search. */ - char *substring) /* Substring to try to find in string. */ + const char *string, /* String to search. */ + const char *substring) /* Substring to try to find in string. */ { - char *a, *b; + const char *a, *b; /* * First scan quickly through the two strings looking for a @@ -49,7 +49,7 @@ strstr( b = substring; if (*b == 0) { - return string; + return (char *)string; } for ( ; *string != 0; string += 1) { if (*string != *b) { @@ -58,7 +58,7 @@ strstr( a = string; while (1) { if (*b == 0) { - return string; + return (char *)string; } if (*a++ != *b++) { break; |