[gawk-diffs] [SCM] gawk branch, master, updated. 17cba1b73bd28fc1579e1738db638da5a687def1

[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, master has been updated
       via  17cba1b73bd28fc1579e1738db638da5a687def1 (commit)
       via  4dad96038318ee5c6fd0c8d1c13d55da2685882d (commit)
       via  313dad7d1952138908194d67f9b3bb5ca12c952a (commit)
      from  c27e3041b27fe978c8e7e647b5afaf667fd594ee (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=17cba1b73bd28fc1579e1738db638da5a687def1

commit 17cba1b73bd28fc1579e1738db638da5a687def1
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 27 18:16:47 2013 +0200

    Code rearrangement to avoid a warning.

diff --git a/ChangeLog b/ChangeLog
index decfe3b..971541c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * Makefile.am (SUBDIRS): Move extension back into the middle of
        the list so that `make check' without a prior `make' works.
 
+       Unrelated:
+
+       * main.c (main): Move env_lc into ifdef for LIBC_IS_BORKED.
+
 2013-03-20         Arnold D. Robbins     <address@hidden>
 
        For systems where libc is borked (MirBSD, maybe others).
diff --git a/main.c b/main.c
index e2aff0c..2a7fbc2 100644
--- a/main.c
+++ b/main.c
@@ -210,7 +210,6 @@ main(int argc, char **argv)
        char *extra_stack;
        int have_srcfile = 0;
        SRCFILE *s;
-       const char *env_lc;
 
        /* do these checks early */
        if (getenv("TIDYMEM") != NULL)
@@ -263,11 +262,15 @@ main(int argc, char **argv)
        gawk_mb_cur_max = MB_CUR_MAX;
        /* Without MBS_SUPPORT, gawk_mb_cur_max is 1. */
 #ifdef LIBC_IS_BORKED
+{
+       const char *env_lc;
+
        env_lc = getenv("LC_ALL");
        if (env_lc == NULL)
                env_lc = getenv("LANG");
        if (env_lc != NULL && env_lc[1] == '\0' && tolower(env_lc[0]) == 'c')
                gawk_mb_cur_max = 1;
+}
 #endif
 
        /* init the cache for checking bytes if they're characters */

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=4dad96038318ee5c6fd0c8d1c13d55da2685882d

commit 4dad96038318ee5c6fd0c8d1c13d55da2685882d
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 27 18:16:01 2013 +0200

    Fix a typo in NEWS.

diff --git a/NEWS b/NEWS
index adfd18a..b3414d0 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Changes from 4.0.2 to 4.1
          list of commands to run first.
        * Use -o to do pretty-printing only.
        * Use -p to do profiling.
-   This consierably reduces gawk's "footprint" and eases the documentation
+   This considerably reduces gawk's "footprint" and eases the documentation
    burden as well.
 
 2. The new -l option (from xgawk) is used for loading dynamic extensions.

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=313dad7d1952138908194d67f9b3bb5ca12c952a

commit 313dad7d1952138908194d67f9b3bb5ca12c952a
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 27 18:15:35 2013 +0200

    Make sure that 'make check' builds in extension.

diff --git a/ChangeLog b/ChangeLog
index d7a0abd..decfe3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-27         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (SUBDIRS): Move extension back into the middle of
+       the list so that `make check' without a prior `make' works.
+
 2013-03-20         Arnold D. Robbins     <address@hidden>
 
        For systems where libc is borked (MirBSD, maybe others).
diff --git a/Makefile.am b/Makefile.am
index 844fa2c..1f1929a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,15 +67,13 @@ distcleancheck_listfiles = \
 # The order to do things in.
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
-#
-# Put 'extension' last, in case building the extensions is not supported.
 SUBDIRS = \
        . \
        awklib \
        doc \
        po \
-       test \
-       extension
+       extension \
+       test
 
 # what to make and install
 bin_PROGRAMS = gawk
diff --git a/Makefile.in b/Makefile.in
index 0e6723c..3b9963d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -398,15 +398,13 @@ distcleancheck_listfiles = \
 # The order to do things in.
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
-#
-# Put 'extension' last, in case building the extensions is not supported.
 SUBDIRS = \
        . \
        awklib \
        doc \
        po \
-       test \
-       extension
+       extension \
+       test
 
 include_HEADERS = gawkapi.h
 

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

Summary of changes:
 ChangeLog   |    9 +++++++++
 Makefile.am |    6 ++----
 Makefile.in |    6 ++----
 NEWS        |    2 +-
 main.c      |    5 ++++-
 5 files changed, 18 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
gawk