Mercurial > hg > octave-nkf > gnulib-hg
changeset 6041:05710fe33bb1
* config/srclist.txt: Comment out $LIBCSRC/posix/regex.h.
Add comments for each pending glibc patch.
* lib/regex.h (__restrict_arr): Don't define to __restrict if
__cplusplus is defined.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 16 Aug 2005 00:07:03 +0000 |
parents | 911b147adb3e |
children | ab97b105b804 |
files | config/ChangeLog config/srclist.txt lib/ChangeLog lib/regex.h |
diffstat | 4 files changed, 34 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2005-08-15 Paul Eggert <eggert@cs.ucla.edu> + + * srclist.txt: Comment out $LIBCSRC/posix/regex.h. + Add comments for each pending glibc patch. + 2005-07-08 Paul Eggert <eggert@cs.ucla.edu> * srclist.txt: Comment out regcomp.c, since we have a porting fix
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.66 2005-07-08 17:57:01 eggert Exp $ +# $Id: srclist.txt,v 1.67 2005-08-16 00:07:03 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -93,20 +93,30 @@ #$LIBCSRC/posix/getopt.h lib gpl (getopt_.h in gnulib) #$LIBCSRC/posix/getopt1.c lib gpl #$LIBCSRC/posix/getopt_int.h lib gpl -# regcomp.c contains a porting fix +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1057 #$LIBCSRC/posix/regcomp.c lib gpl +# $LIBCSRC/posix/regex.c lib gpl -$LIBCSRC/posix/regex.h lib gpl +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1201 +#$LIBCSRC/posix/regex.h lib gpl +# $LIBCSRC/posix/regex_internal.c lib gpl -# regex_internal.h contains a porting fix +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1054 #$LIBCSRC/posix/regex_internal.h lib gpl +# $LIBCSRC/posix/regexec.c lib gpl # c89 changes $LIBCSRC/string/strdup.c lib gpl $LIBCSRC/sysdeps/generic/strtoll.c lib gpl $LIBCSRC/sysdeps/generic/strtoul.c lib gpl $LIBCSRC/sysdeps/generic/strtok_r.c lib gpl $LIBCSRC/sysdeps/generic/memmem.c lib gpl +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1033 #$LIBCSRC/time/mktime.c lib gpl + # # These are close, but ... #$LIBCSRC/crypt/md5.c lib gpl @@ -119,7 +129,10 @@ #$LIBCSRC/misc/error.h lib gpl #$LIBCSRC/misc/getpass.c lib gpl #$LIBCSRC/misc/mkstemp.c lib gpl +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060 #$LIBCSRC/posix/glob.h lib gpl (glob_.h in gnulib) +# #$LIBCSRC/posix/fnmatch.c lib gpl #$LIBCSRC/posix/fnmatch.h lib gpl (fnmatch_.h in gnulib) #$LIBCSRC/posix/fnmatch_loop.c lib gpl @@ -127,7 +140,12 @@ #$LIBCSRC/stdlib/rpmatch.c lib gpl #$LIBCSRC/string/strndup.c lib gpl #$LIBCSRC/string/strverscmp.c lib gpl +# +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1061 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1062 #$LIBCSRC/sysdeps/generic/glob.c lib gpl +# #$LIBCSRC/sysdeps/generic/memchr.c lib gpl #$LIBCSRC/sysdeps/generic/memcmp.c lib gpl #$LIBCSRC/sysdeps/generic/memrchr.c lib gpl
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-08-15 Bruno Haible <bruno@clisp.org> + + * regex.h (__restrict_arr): Don't define to __restrict if __cplusplus + is defined. + 2005-08-14 Jim Meyering <jim@meyering.net> Sync from coreutils.
--- a/lib/regex.h +++ b/lib/regex.h @@ -552,9 +552,9 @@ # endif # endif #endif -/* gcc 3.1 and up support the [restrict] syntax. */ +/* gcc 3.1 and up support the [restrict] syntax, but g++ doesn't. */ #ifndef __restrict_arr -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) +# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined __cplusplus # define __restrict_arr __restrict # else # define __restrict_arr