grep branch, master, updated. v2.6.3-58-gc0db94e

[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  c0db94ecb246e16d797538bfc25c2aee89032142 (commit)
       via  734dcaf837d7ccf675b599c21dfca3d5056b4950 (commit)
      from  42ac56a136085b0fb4dd4c627436b051c922ceb8 (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=c0db94ecb246e16d797538bfc25c2aee89032142


commit c0db94ecb246e16d797538bfc25c2aee89032142
Author: Jim Meyering <address@hidden>
Date:   Tue Apr 20 14:31:45 2010 +0200

    dfa: don't #ifdef-out member declarations
    
    * src/dfa.c (struct dfa): Remove "#if MBS_SUPPORT" guard that made
    several member declarations conditional on this cpp definition.
    (token): Likewise.
    Reported by Anders Wallin.

diff --git a/src/dfa.c b/src/dfa.c
index 340a4c6..f2f5bf7 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -212,7 +212,6 @@ typedef enum
 
   RPAREN,                      /* RPAREN never appears in the parse tree. */
 
-#if MBS_SUPPORT
   ANYCHAR,                     /* ANYCHAR is a terminal symbol that matches
                                   any multibyte (or single byte) characters.
                                   It is used only if MB_CUR_MAX > 1.  */
@@ -222,7 +221,6 @@ typedef enum
 
   WCHAR,                       /* Only returned by lex.  wctok contains
                                    the wide character representation.  */
-#endif /* MBS_SUPPORT */
 
   CSET                         /* CSET and (and any value greater) is a
                                    terminal symbol that matches any of a
@@ -306,7 +304,6 @@ struct dfa
   int nleaves;                 /* Number of leaves on the parse tree. */
   int nregexps;                        /* Count of parallel regexps being built
                                    with dfaparse(). */
-#if MBS_SUPPORT
   unsigned int mb_cur_max;     /* Cached value of MB_CUR_MAX.  */
   int utf8_anychar_classes[5]; /* To lower ANYCHAR in UTF-8 locales.  */
 
@@ -336,7 +333,6 @@ struct dfa
   struct mb_char_classes *mbcsets;
   int nmbcsets;
   int mbcsets_alloc;
-#endif
 
   /* Fields filled by the state builder. */
   dfa_state *states;           /* States of the dfa. */

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=734dcaf837d7ccf675b599c21dfca3d5056b4950


commit c0db94ecb246e16d797538bfc25c2aee89032142
Author: Jim Meyering <address@hidden>
Date:   Tue Apr 20 14:31:45 2010 +0200

    dfa: don't #ifdef-out member declarations
    
    * src/dfa.c (struct dfa): Remove "#if MBS_SUPPORT" guard that made
    several member declarations conditional on this cpp definition.
    (token): Likewise.
    Reported by Anders Wallin.

diff --git a/src/dfa.c b/src/dfa.c
index 340a4c6..f2f5bf7 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -212,7 +212,6 @@ typedef enum
 
   RPAREN,                      /* RPAREN never appears in the parse tree. */
 
-#if MBS_SUPPORT
   ANYCHAR,                     /* ANYCHAR is a terminal symbol that matches
                                   any multibyte (or single byte) characters.
                                   It is used only if MB_CUR_MAX > 1.  */
@@ -222,7 +221,6 @@ typedef enum
 
   WCHAR,                       /* Only returned by lex.  wctok contains
                                    the wide character representation.  */
-#endif /* MBS_SUPPORT */
 
   CSET                         /* CSET and (and any value greater) is a
                                    terminal symbol that matches any of a
@@ -306,7 +304,6 @@ struct dfa
   int nleaves;                 /* Number of leaves on the parse tree. */
   int nregexps;                        /* Count of parallel regexps being built
                                    with dfaparse(). */
-#if MBS_SUPPORT
   unsigned int mb_cur_max;     /* Cached value of MB_CUR_MAX.  */
   int utf8_anychar_classes[5]; /* To lower ANYCHAR in UTF-8 locales.  */
 
@@ -336,7 +333,6 @@ struct dfa
   struct mb_char_classes *mbcsets;
   int nmbcsets;
   int mbcsets_alloc;
-#endif
 
   /* Fields filled by the state builder. */
   dfa_state *states;           /* States of the dfa. */

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

Summary of changes:
 src/dfa.c         |    4 ----
 tests/Makefile.am |    1 +
 tests/ignore-mmap |   17 +++++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 tests/ignore-mmap


hooks/post-receive
-- 
grep