diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | builtin.c | 16 |
2 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2011-07-29 Eli Zaretskii <eliz@gnu.org> + + * 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. + 2011-07-28 Arnold D. Robbins <arnold@skeeve.com> * builtin.c (do_sub): Revert to gawk 3.1 behavior for backslash @@ -605,7 +605,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; @@ -725,7 +725,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; @@ -907,7 +907,7 @@ check_pos: goto retry; #endif case 'l': - if (big) + if (big_flag) break; else { static short warned = FALSE; @@ -921,10 +921,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; @@ -938,10 +938,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; @@ -955,7 +955,7 @@ check_pos: goto out; } } - small = TRUE; + small_flag = TRUE; goto retry; case 'c': need_format = FALSE; |