diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-09 21:53:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-09 21:53:07 +0000 |
| commit | 30baa360c58a1de211bd14937530dfaf8362fae3 (patch) | |
| tree | e3fd62d660e26c405dee02807a93078feb7175f0 | |
| parent | c3d6c951998a1687ad462bdd5e9bcbb691e1db8a (diff) | |
| download | glibc-30baa360c58a1de211bd14937530dfaf8362fae3.tar.gz glibc-30baa360c58a1de211bd14937530dfaf8362fae3.tar.xz glibc-30baa360c58a1de211bd14937530dfaf8362fae3.zip | |
Update.
* posix/regex.c: Define regerror really as __regerror. * posix/regex.h: Add __ protected prototypes for regcomp, regexec, regerror and regfree.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | posix/regex.c | 2 | ||||
| -rw-r--r-- | posix/regex.h | 27 |
3 files changed, 24 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 2464b22a94..88b1655839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1998-04-09 Ulrich Drepper <drepper@cygnus.com> + * posix/regex.c: Define regerror really as __regerror. + * posix/regex.h: Add __ protected prototypes for regcomp, regexec, + regerror and regfree. + * stdlib/strtof_l.c: Declare ____strtoull_l_internal. * stdlib/strtod_l.c: Likewise. * stdlib/strtold_l.c: Likewise. diff --git a/posix/regex.c b/posix/regex.c index 1051cc3ac6..aeaf198a15 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -5761,7 +5761,7 @@ weak_alias (__regexec, regexec) from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) +__regerror (errcode, preg, errbuf, errbuf_size) int errcode; const regex_t *preg; char *errbuf; diff --git a/posix/regex.h b/posix/regex.h index 29e9692b90..cb26d54072 100644 --- a/posix/regex.h +++ b/posix/regex.h @@ -536,14 +536,25 @@ extern int re_exec _RE_ARGS ((const char *)); #endif /* POSIX compatibility. */ -extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); -extern int regexec - _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, - regmatch_t pmatch[], int eflags)); -extern size_t regerror - _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, - size_t errbuf_size)); -extern void regfree _RE_ARGS ((regex_t *preg)); +extern int __regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern, + int __cflags)); +extern int regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern, + int __cflags)); + +extern int __regexec _RE_ARGS ((const regex_t *__preg, + const char *__string, size_t __nmatch, + regmatch_t __pmatch[], int __eflags)); +extern int regexec _RE_ARGS ((const regex_t *__preg, + const char *__string, size_t __nmatch, + regmatch_t __pmatch[], int __eflags)); + +extern size_t __regerror _RE_ARGS ((int __errcode, const regex_t *__preg, + char *__errbuf, size_t __errbuf_size)); +extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, + char *__errbuf, size_t __errbuf_size)); + +extern void __regfree _RE_ARGS ((regex_t *__preg)); +extern void regfree _RE_ARGS ((regex_t *__preg)); #ifdef __cplusplus |