Mercurial > hg > octave-lojdl > gnulib-hg
changeset 4582:02efc69861ae
Undo white space changes of 2003-08-12, allowing us to sync more files
from glibc.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 17 Aug 2003 05:30:20 +0000 |
| parents | c7968d8641ac |
| children | 49061d1a606e |
| files | config/ChangeLog config/srclist.txt lib/ChangeLog lib/regex.h lib/strdup.c lib/strtoll.c lib/strtoul.c |
| diffstat | 7 files changed, 24 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,9 +1,15 @@ +2003-08-16 Paul Eggert <eggert@twinsun.com> + + * srclist.txt: Get regex.h, strdup.c, strtoll.c, + strtoul.c from libc, undoing this 2003-08-12 change: + <http://mail.gnu.org/archive/html/bug-gnulib/2003-08/msg00080.html> + 2003-08-15 Paul Eggert <eggert@twinsun.com> * srclist-update: Use three spaces, rather than tab, after '#' in shell-script copyright notices. Suggested by Bruno Haible. Remove unnecessary parenthesization in regular expression. - + 2003-08-13 Paul Eggert <eggert@twinsun.com> * srclist-update: Change update back to the old behavior, leaving @@ -21,12 +27,12 @@ (fixfile): Use them to normalize spacing a bit in copied files. * config.guess, config.sub, install-sh, missing, texinfo.tex: Normalize leading white space and remove trailing white space. - + * texinfo.tex: Sync with texinfo. * srclist.txt: Don't get regex.h, strdup.c, strtoll.c, strtoul.c from libc, to merge coreutils whitespace changes. - + * srclist.txt: Get the following m4 files from gettext: codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, inttypes-pri.m4, lcmessage.m4, lib-ld.m4, lib-link.m4, lib-prefix.m4,
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.22 2003-08-12 23:27:26 eggert Exp $ +# $Id: srclist.txt,v 1.23 2003-08-17 05:30:20 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -76,6 +76,10 @@ $LIBCSRC/argp/argp.h lib gpl $LIBCSRC/posix/getopt.h lib gpl $LIBCSRC/posix/getopt1.c lib gpl +$LIBCSRC/posix/regex.h lib gpl +$LIBCSRC/string/strdup.c lib gpl +$LIBCSRC/sysdeps/generic/strtoll.c lib gpl +$LIBCSRC/sysdeps/generic/strtoul.c lib gpl # # These are close, but ... #$LIBCSRC/crypt/md5.c lib gpl @@ -92,10 +96,8 @@ #$LIBCSRC/posix/fnmatch.h lib gpl (fnmatch_.h in gnulib) #$LIBCSRC/posix/fnmatch_loop.c lib gpl #$LIBCSRC/posix/getopt.c lib gpl -#$LIBCSRC/posix/regex.h lib gpl #$LIBCSRC/posix/tempname.c lib gpl #$LIBCSRC/stdlib/rpmatch.c lib gpl -#$LIBCSRC/string/strdup.c lib gpl #$LIBCSRC/string/strndup.c lib gpl #$LIBCSRC/string/strverscmp.c lib gpl #$LIBCSRC/sysdeps/generic/memchr.c lib gpl @@ -108,8 +110,6 @@ #$LIBCSRC/sysdeps/generic/strpbrk.c lib gpl #$LIBCSRC/sysdeps/generic/strstr.c lib gpl #$LIBCSRC/sysdeps/generic/strtol.c lib gpl -#$LIBCSRC/sysdeps/generic/strtoll.c lib gpl -#$LIBCSRC/sysdeps/generic/strtoul.c lib gpl #$LIBCSRC/sysdeps/posix/dup2.c lib gpl #$LIBCSRC/sysdeps/posix/euidaccess.c lib gpl #$LIBCSRC/sysdeps/unix/bsd/poll.c lib gpl
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2003-08-16 Paul Eggert <eggert@twinsun.com> + + * regex.h, strdup.c, strtoll.c, strtoul.c: Do not normalize white + space, undoing this 2003-08-12 change: + <http://mail.gnu.org/archive/html/bug-gnulib/2003-08/msg00080.html> + 2003-08-16 Jim Meyering <jim@meyering.net> Merge from coreutils.
--- a/lib/regex.h +++ b/lib/regex.h @@ -193,7 +193,7 @@ & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \ | RE_CONTEXT_INVALID_OPS )) -#define RE_SYNTAX_POSIX_AWK \ +#define RE_SYNTAX_POSIX_AWK \ (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ | RE_INTERVALS | RE_NO_GNU_OPS)
--- a/lib/strdup.c +++ b/lib/strdup.c @@ -16,7 +16,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #if defined _LIBC || defined STDC_HEADERS