summaryrefslogtreecommitdiffstats
path: root/generic/regex.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2019-12-30 21:25:43 (GMT)
committerdgp <dgp@users.sourceforge.net>2019-12-30 21:25:43 (GMT)
commit341619118a2ea2f6da6062f2069842d22d2bbb8f (patch)
treec3254e9ffb9adf777a3a13d28c6f4e556593ee6f /generic/regex.h
parent7278c6fb2c9bd8691b60e61ac24a57a85d10c1ae (diff)
parent30d15963daa3545b3a2b09e6cd1f340f68723020 (diff)
downloadtcl-341619118a2ea2f6da6062f2069842d22d2bbb8f.zip
tcl-341619118a2ea2f6da6062f2069842d22d2bbb8f.tar.gz
tcl-341619118a2ea2f6da6062f2069842d22d2bbb8f.tar.bz2
merge 8.7
Diffstat (limited to 'generic/regex.h')
-rw-r--r--generic/regex.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/regex.h b/generic/regex.h
index 8845f72..dba3ab4 100644
--- a/generic/regex.h
+++ b/generic/regex.h
@@ -151,8 +151,8 @@ typedef struct {
int re_csize; /* sizeof(character) */
char *re_endp; /* backward compatibility kludge */
/* the rest is opaque pointers to hidden innards */
- char *re_guts; /* `char *' is more portable than `void *' */
- char *re_fns;
+ void *re_guts;
+ void *re_fns;
} regex_t;
/* result reporting (may acquire more fields later) */
@@ -232,7 +232,7 @@ typedef struct {
* of character is used for error reports is independent of what kind is used
* in matching.
*
- ^ extern size_t regerror(int, const regex_t *, char *, size_t);
+ ^ extern size_t regerror(int, char *, size_t);
*/
#define REG_OKAY 0 /* no errors detected */
#define REG_NOMATCH 1 /* failed to match */
@@ -283,7 +283,7 @@ int regexec(regex_t *, const char *, size_t, regmatch_t [], int);
MODULE_SCOPE int __REG_WIDE_EXEC(regex_t *, const __REG_WIDE_T *, size_t, rm_detail_t *, size_t, regmatch_t [], int);
#endif
MODULE_SCOPE void regfree(regex_t *);
-MODULE_SCOPE size_t regerror(int, const regex_t *, char *, size_t);
+MODULE_SCOPE size_t regerror(int, char *, size_t);
/* automatically gathered by fwd; do not hand-edit */
/* =====^!^===== end forwards =====^!^===== */