grep branch, master, updated. v2.7-5-gb92e6c2

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  b92e6c21642dd200e3e352997f20ab9bfb556a61 (commit)
       via  0c2116369aad7e65a77ea40e70f0de647d1f82e1 (commit)
      from  78fd9c3e1082aa924d6391120f37e803b5368164 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b92e6c21642dd200e3e352997f20ab9bfb556a61


commit b92e6c21642dd200e3e352997f20ab9bfb556a61
Author: Jim Meyering <address@hidden>
Date:   Tue Sep 21 16:33:41 2010 +0200

    build: avoid compilation failure on the Hurd
    
    * src/dfasearch.c (dfawarn): Rename enum symbols to use DW_ prefix,
    so as not to collide with "GNU", which is defined by the Hurd.
    Reported by Matthias Lanzinger in http://savannah.gnu.org/bugs/?31096

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 44eb08a..780891f 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -61,10 +61,10 @@ dfaerror (char const *mesg)
 void
 dfawarn (char const *mesg)
 {
-  static enum { NONE = 0, POSIX, GNU } mode;
-  if (mode == NONE)
-    mode = (getenv ("POSIXLY_CORRECT") ? POSIX : GNU);
-  if (mode == GNU)
+  static enum { DW_NONE = 0, DW_POSIX, DW_GNU } mode;
+  if (mode == DW_NONE)
+    mode = (getenv ("POSIXLY_CORRECT") ? DW_POSIX : DW_GNU);
+  if (mode == DW_GNU)
     dfaerror (mesg);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=0c2116369aad7e65a77ea40e70f0de647d1f82e1


commit b92e6c21642dd200e3e352997f20ab9bfb556a61
Author: Jim Meyering <address@hidden>
Date:   Tue Sep 21 16:33:41 2010 +0200

    build: avoid compilation failure on the Hurd
    
    * src/dfasearch.c (dfawarn): Rename enum symbols to use DW_ prefix,
    so as not to collide with "GNU", which is defined by the Hurd.
    Reported by Matthias Lanzinger in http://savannah.gnu.org/bugs/?31096

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 44eb08a..780891f 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -61,10 +61,10 @@ dfaerror (char const *mesg)
 void
 dfawarn (char const *mesg)
 {
-  static enum { NONE = 0, POSIX, GNU } mode;
-  if (mode == NONE)
-    mode = (getenv ("POSIXLY_CORRECT") ? POSIX : GNU);
-  if (mode == GNU)
+  static enum { DW_NONE = 0, DW_POSIX, DW_GNU } mode;
+  if (mode == DW_NONE)
+    mode = (getenv ("POSIXLY_CORRECT") ? DW_POSIX : DW_GNU);
+  if (mode == DW_GNU)
     dfaerror (mesg);
 }
 

-----------------------------------------------------------------------

Summary of changes:
 bootstrap.conf  |    5 ++---
 src/dfasearch.c |    8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
grep