FYI, I've just pushed these four clean-up patches. I would like to make a snapshot tomorrow.
>From 3fded6e2d8dc1ab7eb5df6bc70c6ed1b7ca3a0b6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 20 Mar 2010 23:14:14 +0100 Subject: [PATCH 1/4] build: stop using gnulib's memmove module * bootstrap.conf (gnulib_modules): Remove obsolete module: memmove --- bootstrap.conf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 0f38fcb..5d73b68 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -47,7 +47,6 @@ manywarnings mbrlen mbrtowc memchr -memmove mempcpy obstack progname -- 1.7.0.2.486.gfdfcd >From 3ed4e064845af85aa0de661dbe7d1369f4c965b6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sun, 21 Mar 2010 14:37:58 +0100 Subject: [PATCH 2/4] maint: alphabetize #include directives * src/grep.c: Alphabetize #include directives. --- src/grep.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/grep.c b/src/grep.c index f4cd875..1baf3b2 100644 --- a/src/grep.c +++ b/src/grep.c @@ -35,17 +35,18 @@ #endif #include <stdio.h> #include "system.h" -#include "getopt.h" -#include "grep.h" -#include "savedir.h" -#include "xstrtol.h" -#include "xalloc.h" + +#include "closeout.h" #include "error.h" #include "exclude.h" #include "exitfail.h" -#include "closeout.h" -#include "progname.h" +#include "getopt.h" +#include "grep.h" #include "isdir.h" +#include "progname.h" +#include "savedir.h" +#include "xalloc.h" +#include "xstrtol.h" #define SEP_CHAR_SELECTED ':' #define SEP_CHAR_REJECTED '-' -- 1.7.0.2.486.gfdfcd >From 745922cf506b73fef140c4638777a5a9aa40c61c Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sun, 21 Mar 2010 14:40:36 +0100 Subject: [PATCH 3/4] maint: remove TYPE_* definitions from src/system.h * src/system.h (TYPE_MAXIMUM, TYPE_MINIMUM, TYPE_SIGNED): Remove definitions. They are provided by intprops.h. * src/grep.c: Include "intprops.h" * bootstrap.conf (gnulib_modules): Add intprops. --- bootstrap.conf | 1 + src/grep.c | 1 + src/system.h | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 5d73b68..28794ec 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -39,6 +39,7 @@ gnu-web-doc-update gnupload hard-locale ignore-value +intprops isdir locale malloc diff --git a/src/grep.c b/src/grep.c index 1baf3b2..591f801 100644 --- a/src/grep.c +++ b/src/grep.c @@ -42,6 +42,7 @@ #include "exitfail.h" #include "getopt.h" #include "grep.h" +#include "intprops.h" #include "isdir.h" #include "progname.h" #include "savedir.h" diff --git a/src/system.h b/src/system.h index 3595832..4398a5f 100644 --- a/src/system.h +++ b/src/system.h @@ -41,13 +41,6 @@ enum { EXIT_TROUBLE = 2 }; -/* The extra casts work around common compiler bugs. */ -#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) \ - : (t) 0)) -#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) - #ifndef isgraph # define isgraph(C) (isprint(C) && !isspace(C)) #endif -- 1.7.0.2.486.gfdfcd >From 3f6b7379652bb1d9a6ebc02134d64172d82a669d Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sun, 21 Mar 2010 14:57:30 +0100 Subject: [PATCH 4/4] maint: use gnulib's fcntl module, just in case * bootstrap.conf (gnulib_modules): Add fcntl. Grep uses at least O_BINARY, which may be defined therein. --- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 28794ec..2cdcefa 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -29,6 +29,7 @@ dirname do-release-commit-and-tag error exclude +fcntl fnmatch getopt-gnu getpagesize -- 1.7.0.2.486.gfdfcd
