1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From: Georges Khaznadar <georgesk@debian.org>
Date: Sat, 8 Mar 2025 19:32:22 +0100
Subject: renamed variables "bool" to "boolean" since this word is reserved
with gcc-15
---
src/gt1/gt1-parset1.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gt1/gt1-parset1.c b/src/gt1/gt1-parset1.c
index 94efb6a..b797074 100644
--- a/src/gt1/gt1-parset1.c
+++ b/src/gt1/gt1-parset1.c
@@ -1608,15 +1608,15 @@ static void
internal_ifelse (Gt1PSContext *psc)
{
Gt1Proc *proc1, *proc2;
- int bool;
+ int boolean;
if (psc->n_values >= 3 &&
- get_stack_bool (psc, &bool, 3) &&
+ get_stack_bool (psc, &boolean, 3) &&
get_stack_proc (psc, &proc1, 2) &&
get_stack_proc (psc, &proc2, 1))
{
psc->n_values -= 3;
- if (bool)
+ if (boolean)
eval_proc (psc, proc1);
else
eval_proc (psc, proc2);
@@ -1627,14 +1627,14 @@ static void
internal_if (Gt1PSContext *psc)
{
Gt1Proc *proc;
- int bool;
+ int boolean;
if (psc->n_values >= 2 &&
- get_stack_bool (psc, &bool, 2) &&
+ get_stack_bool (psc, &boolean, 2) &&
get_stack_proc (psc, &proc, 1))
{
psc->n_values -= 2;
- if (bool)
+ if (boolean)
eval_proc (psc, proc);
}
}
@@ -1669,12 +1669,12 @@ internal_for (Gt1PSContext *psc)
static void
internal_not (Gt1PSContext *psc)
{
- int bool;
+ int boolean;
if (psc->n_values >= 1 &&
- get_stack_bool (psc, &bool, 1))
+ get_stack_bool (psc, &boolean, 1))
{
- psc->value_stack[psc->n_values - 1].val.bool_val = !bool;
+ psc->value_stack[psc->n_values - 1].val.bool_val = !boolean;
}
}
|
