mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 03:03:37 +00:00
76 lines
1.6 KiB
Diff
76 lines
1.6 KiB
Diff
|
This patch fixes compilation on Windows, where some of the identifiers
|
||
|
|
would clash.
|
||
|
|
|
||
|
|
commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0
|
||
|
|
Author: Arnold D. Robbins <arnold@skeeve.com>
|
||
|
|
Date: Fri Jul 29 13:25:57 2011 +0300
|
||
|
|
|
||
|
|
Fix DJGPP problem with libsigsegv.
|
||
|
|
|
||
|
|
diff --git a/builtin.c b/builtin.c
|
||
|
|
index 4d87592..941f5ad 100644
|
||
|
|
--- a/builtin.c
|
||
|
|
+++ b/builtin.c
|
||
|
|
@@ -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;
|