grep branch, master, updated. v2.10-13-g9d68b23

[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  9d68b23adfe963387525a5a3e8eb84957ee17212 (commit)
       via  3054c6850e0d3d1578f5e87c23e595ed528fbf6e (commit)
      from  5f2a03af5258eabb1263e58229fd4d1f395ca14a (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=9d68b23adfe963387525a5a3e8eb84957ee17212


commit 9d68b23adfe963387525a5a3e8eb84957ee17212
Author: Arnold Robbins <address@hidden>
Date:   Tue Nov 29 19:06:32 2011 +0100

    dfa: do not call nl_langinfo in !MBS_SUPPORT mode
    
    * src/dfa.c (using_utf8) [!MBS_SUPPORT]: Remove erroneous "defined"
    in cpp test for MBS_SUPPORT.  Since commit a163349d, MBS_SUPPORT is 0/1.
    This error caused trouble only in the !MBS_SUPPORT case.

diff --git a/src/dfa.c b/src/dfa.c
index 969a72e..26ea4b5 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -628,7 +628,7 @@ using_utf8 (void)
   static int utf8 = -1;
   if (utf8 == -1)
     {
-#if defined HAVE_LANGINFO_CODESET && defined MBS_SUPPORT
+#if defined HAVE_LANGINFO_CODESET && MBS_SUPPORT
       utf8 = (STREQ (nl_langinfo (CODESET), "UTF-8"));
 #else
       utf8 = 0;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3054c6850e0d3d1578f5e87c23e595ed528fbf6e


commit 9d68b23adfe963387525a5a3e8eb84957ee17212
Author: Arnold Robbins <address@hidden>
Date:   Tue Nov 29 19:06:32 2011 +0100

    dfa: do not call nl_langinfo in !MBS_SUPPORT mode
    
    * src/dfa.c (using_utf8) [!MBS_SUPPORT]: Remove erroneous "defined"
    in cpp test for MBS_SUPPORT.  Since commit a163349d, MBS_SUPPORT is 0/1.
    This error caused trouble only in the !MBS_SUPPORT case.

diff --git a/src/dfa.c b/src/dfa.c
index 969a72e..26ea4b5 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -628,7 +628,7 @@ using_utf8 (void)
   static int utf8 = -1;
   if (utf8 == -1)
     {
-#if defined HAVE_LANGINFO_CODESET && defined MBS_SUPPORT
+#if defined HAVE_LANGINFO_CODESET && MBS_SUPPORT
       utf8 = (STREQ (nl_langinfo (CODESET), "UTF-8"));
 #else
       utf8 = 0;

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

Summary of changes:
 src/dfa.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep