[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. bc5591ac396525b1cf2a2e43f4396b4b854edd9b

[Arnold Robbins]

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 "gawk".

The branch, gawk-4.0-stable has been updated
       via  bc5591ac396525b1cf2a2e43f4396b4b854edd9b (commit)
      from  a203ea7b6796d2a48c82827ab5ead9589baa6bd8 (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.sv.gnu.org/cgit/gawk.git/commit/?id=bc5591ac396525b1cf2a2e43f4396b4b854edd9b

commit bc5591ac396525b1cf2a2e43f4396b4b854edd9b
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Sep 21 22:08:11 2011 +0300

    Additional mbs fixes.

diff --git a/ChangeLog b/ChangeLog
index e92c00e..425f706 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        that remove many ifdefs, moving many conditions for multibyte
        support into regular C code and relying GCC's dead code optimization
        to elimnate code that won't be needed.
+       * dfa.c: Further edits now that MBS_SUPPORT is always defined.
 
 2011-09-16         Arnold D. Robbins     <address@hidden>
 
diff --git a/dfa.c b/dfa.c
index 29febf5..9a2e01e 100644
--- a/dfa.c
+++ b/dfa.c
@@ -53,8 +53,8 @@
 #include "gettext.h"
 #define _(str) gettext (str)
 
-#include "mbsupport.h"  /* defines MBS_SUPPORT if appropriate */
-#ifdef MBS_SUPPORT
+#include "mbsupport.h"  /* defines MBS_SUPPORT to 1 or 0, as appropriate */
+#if MBS_SUPPORT
 /* We can handle multibyte strings. */
 #include <wchar.h>
 #include <wctype.h>
@@ -640,7 +640,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;
diff --git a/mbsupport.h b/mbsupport.h
index 4b71019..4c9e9bf 100644
--- a/mbsupport.h
+++ b/mbsupport.h
@@ -57,8 +57,6 @@
 #else
 # define MBS_SUPPORT 0
 #endif
-# undef MBS_SUPPORT
-# define MBS_SUPPORT 0
 
 #if ! MBS_SUPPORT
 # undef MB_CUR_MAX

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

Summary of changes:
 ChangeLog   |    1 +
 dfa.c       |    6 +++---
 mbsupport.h |    2 --
 3 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk