grep branch, master, updated. v2.18-34-gc40e7f7

[Paul Eggert]

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  c40e7f7158109985b901ae67e5faa06160547471 (commit)
      from  ddea6c8ea3529f3364257e0e239775c63bf1b95d (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=c40e7f7158109985b901ae67e5faa06160547471


commit c40e7f7158109985b901ae67e5faa06160547471
Author: Paul Eggert <address@hidden>
Date:   Wed Mar 26 21:37:54 2014 -0700

    dfa: improve port to freestanding DJGPP
    
    * src/dfa.c (setlocale) [!LC_ALL]: Return "C", not NULL (Bug#17056).
    (using_simple_locale): Store setlocale result in a ptr-to-const.

diff --git a/src/dfa.c b/src/dfa.c
index 0a2b8b8..f88ff2a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -37,7 +37,7 @@
 /* Gawk doesn't use Gnulib, so don't assume that setlocale and
    static_assert are present.  */
 #ifndef LC_ALL
-# define setlocale(category, locale) NULL
+# define setlocale(category, locale) "C"
 #endif
 #ifndef static_assert
 # define static_assert(cond, diagnostic) \
@@ -783,7 +783,7 @@ using_simple_locale (void)
       static int unibyte_c = -1;
       if (unibyte_c < 0)
         {
-          char *locale = setlocale (LC_ALL, NULL);
+          char const *locale = setlocale (LC_ALL, NULL);
           unibyte_c = (locale && (STREQ (locale, "C")
                                   || STREQ (locale, "POSIX")));
         }

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

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


hooks/post-receive
-- 
grep