Undo white space changes of 2003-08-12, allowing us to sync more files

from glibc.

diff --git a/config/ChangeLog b/config/ChangeLog
index 2c989a073a0f4ec49184386974687e8f9052bd67..dd032cc0dbd43dde20be9bbe2cd0626a4c72f504 100644 (file)
--- 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,

diff --git a/config/srclist.txt b/config/srclist.txt
index 69e7a9a03b7522f1ec06bf27654d4c4f95957439..050bde19c8ed9902ba6b54757ce63c8a02c6ce7b 100644 (file)
--- 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-xinl.c            lib gpl
 $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/getopt1.c             lib gpl
 #$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/posix/getopt1.c            lib gpl
 #$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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7010646adbdd45336284cea4dc0592759367365c..0b7e058bf1799132c3ae05f11e0342e305389b79 100644 (file)
--- 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.

diff --git a/lib/regex.h b/lib/regex.h
index 53bdd8ff46115c4dac2be2a4908b08c6d2f9f68c..07ba1d02d85c30d1dabf143dcdb6d70677f1196f 100644 (file)
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -193,7 +193,7 @@ extern reg_syntax_t re_syntax_options;
    & ~(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)
 

diff --git a/lib/strdup.c b/lib/strdup.c
index d3720719937fc20c8811e98894d4623d077aebb2..5aa09a652c3f2ab46218afb8b5a0708ad40f9fdd 100644 (file)
--- 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

diff --git a/lib/strtoll.c b/lib/strtoll.c
index 5d7b329565913643313cf2c96531480cb4f3c6c8..8e9b26190e28efc253f16ab0f2a15c34c8f94547 100644 (file)
--- a/lib/strtoll.c
+++ b/lib/strtoll.c
@@ -16,7 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define QUAD 1
+#define        QUAD    1
 
 #include <strtol.c>
 

diff --git a/lib/strtoul.c b/lib/strtoul.c
index 63f8d9cc9aab63ac8e32fe4c586bacf3412a1922..bb62f9b658b2b1732d8a1897787c9cbab1a01a4b 100644 (file)
--- a/lib/strtoul.c
+++ b/lib/strtoul.c
@@ -15,6 +15,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define UNSIGNED 1
+#define        UNSIGNED        1
 
 #include "strtol.c"