FYI, make syntax-check would have failed with the latest from gnulib, so...
>From 9de94f53b5b63330b7658f3b63d06021aabfc7c6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sun, 23 Jan 2011 18:57:50 +0100 Subject: [PATCH 1/2] maint: avoid new syntax-check failure * src/diff.c (specify_value): Use !STREQ(...), not strcmp(...) != 0. * src/diff3.c (main): Likewise. --- src/diff.c | 2 +- src/diff3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diff.c b/src/diff.c index 0992db9..0a25465 100644 --- a/src/diff.c +++ b/src/diff.c @@ -959,7 +959,7 @@ usage (void) static void specify_value (char const **var, char const *value, char const *option) { - if (*var && strcmp (*var, value) != 0) + if (*var && ! STREQ (*var, value)) { error (0, 0, _("conflicting %s option value `%s'"), option, value); try_help (NULL, NULL); diff --git a/src/diff3.c b/src/diff3.c index be36ad1..44bc17f 100644 --- a/src/diff3.c +++ b/src/diff3.c @@ -362,7 +362,7 @@ main (int argc, char **argv) rev_mapping[mapping[i]] = i; for (i = 0; i < 3; i++) - if (strcmp (file[i], "-") != 0) + if (! STREQ (file[i], "-")) { if (stat (file[i], &statb) < 0) perror_with_exit (file[i]); -- 1.7.3.5.38.gb312b >From c16c3176840de5a153186aa9f981453cac25451f Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sun, 23 Jan 2011 18:58:27 +0100 Subject: [PATCH 2/2] build: update gnulib submodule to latest --- gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gnulib b/gnulib index a2e8447..8cac690 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit a2e8447d6b8abe23504f4f2d4757a60a2e8bee54 +Subproject commit 8cac6904c1eb928f5f9a7d3c6e79fd6285b08930 -- 1.7.3.5.38.gb312b
