Mercurial > hg > octave-nkf > gnulib-hg
changeset 6104:1e308ce32c4c
* config/srclist.txt: Add glibc bug 1240.
* lib/regcomp.c (regerror): 2nd arg is 'restrict', as per POSIX.
* lib/regex.h (regerror): Likewise.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Thu, 25 Aug 2005 05:08:59 +0000 |
parents | 8d65abf5cb96 |
children | 5c21751aacdd |
files | config/ChangeLog config/srclist.txt lib/ChangeLog lib/regcomp.c lib/regex.h |
diffstat | 5 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,7 +1,7 @@ 2005-08-24 Paul Eggert <eggert@cs.ucla.edu> * srclist.txt: Remove glibc bug 1233 and add 1236, which supersedes it. - Add glibc bugs 1237 and 1238. Comment out lib/regex.c. + Add glibc bugs 1237, 1238, 1240. Comment out lib/regex.c. 2005-08-23 Paul Eggert <eggert@cs.ucla.edu>
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.84 2005-08-24 23:43:00 eggert Exp $ +# $Id: srclist.txt,v 1.85 2005-08-25 05:09:01 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -100,6 +100,7 @@ # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1223 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1224 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1237 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1240 #$LIBCSRC/posix/regcomp.c lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1238 @@ -110,6 +111,7 @@ # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1222 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1232 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1236 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1240 #$LIBCSRC/posix/regex.h lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1215
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,8 @@ 2005-08-24 Paul Eggert <eggert@cs.ucla.edu> + * regcomp.c (regerror): 2nd arg is 'restrict', as per POSIX. + * regex.h (regerror): Likewise. + * regex.c: Do not include <sys/types.h>, as POSIX no longer requires this. (The code never needed it.)
--- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -496,7 +496,8 @@ from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) +regerror (int errcode, const regex_t *__restrict preg, + char *__restrict errbuf, size_t errbuf_size) { const char *msg; size_t msg_size;
--- a/lib/regex.h +++ b/lib/regex.h @@ -614,8 +614,8 @@ regmatch_t __pmatch[__restrict_arr], int __eflags); -extern size_t regerror (int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size); +extern size_t regerror (int __errcode, const regex_t *__restrict __preg, + char *__restrict __errbuf, size_t __errbuf_size); extern void regfree (regex_t *__preg);