Re: [bug-gawk] gawk 4.0.0 compile error when sigsegv is enabled (mingw32)

[Eli Zaretskii]

> Date: Mon, 25 Jul 2011 09:05:03 GMT
> From: address@hidden
> Cc: address@hidden
> 
> Eli - please submit a patch, either specific to mingw or renaming the
> variable, as you like.

Below.

2011-07-29  Eli Zaretskii  <address@hidden>

        * builtin.c (format_tree): Rename small -> small_flag,
        big -> big_flag, bigbig -> bigbig_flag.  Solves compilation errors
        when building Gawk with libsigsegv on MS-Windows, see
        https://lists.gnu.org/archive/html/bug-gawk/2011-07/msg00029.html.


--- builtin.c~0 2011-04-29 14:50:40.000000000 +0300
+++ builtin.c   2011-07-29 11:35:36.673625000 +0300
@@ -606,7 +606,7 @@ format_tree(
        NODE *arg;
        long fw, prec, argnum;
        int used_dollar;
-       int lj, alt, big, bigbig, small, have_prec, need_format;
+       int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format;
        long *cur = NULL;
        uintmax_t uval;
        int sgn;
@@ -726,7 +726,7 @@ format_tree(
                signchar = FALSE;
                zero_flag = FALSE;
                quote_flag = FALSE;
-               lj = alt = big = bigbig = small = FALSE;
+               lj = alt = big_flag = bigbig_flag = small_flag = FALSE;
                fill = sp;
                cp = cend;
                chbuf = lchbuf;
@@ -908,7 +908,7 @@ check_pos:
                        goto retry;  
 #endif
                case 'l':
-                       if (big)
+                       if (big_flag)
                                break;
                        else {
                                static short warned = FALSE;
@@ -922,10 +922,10 @@ check_pos:
                                        goto out;
                                }
                        }
-                       big = TRUE;
+                       big_flag = TRUE;
                        goto retry;
                case 'L':
-                       if (bigbig)
+                       if (bigbig_flag)
                                break;
                        else {
                                static short warned = FALSE;
@@ -939,10 +939,10 @@ check_pos:
                                        goto out;
                                }
                        }
-                       bigbig = TRUE;
+                       bigbig_flag = TRUE;
                        goto retry;
                case 'h':
-                       if (small)
+                       if (small_flag)
                                break;
                        else {
                                static short warned = FALSE;
@@ -956,7 +956,7 @@ check_pos:
                                        goto out;
                                }
                        }
-                       small = TRUE;
+                       small_flag = TRUE;
                        goto retry;
                case 'c':
                        need_format = FALSE;