aboutsummaryrefslogtreecommitdiff
path: root/textproc/xmlroff/files/patch-expr::fo-expr-eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/xmlroff/files/patch-expr::fo-expr-eval.c')
-rw-r--r--textproc/xmlroff/files/patch-expr::fo-expr-eval.c67
1 files changed, 60 insertions, 7 deletions
diff --git a/textproc/xmlroff/files/patch-expr::fo-expr-eval.c b/textproc/xmlroff/files/patch-expr::fo-expr-eval.c
index e8214801276d..53e064bfa0a8 100644
--- a/textproc/xmlroff/files/patch-expr::fo-expr-eval.c
+++ b/textproc/xmlroff/files/patch-expr::fo-expr-eval.c
@@ -1,6 +1,6 @@
---- expr/fo-expr-eval.c.orig Mon Jan 10 13:58:52 2005
-+++ expr/fo-expr-eval.c Mon Jan 10 14:02:29 2005
-@@ -1244,14 +1244,22 @@
+--- expr/fo-expr-eval.c.orig Mon Feb 28 20:55:34 2005
++++ expr/fo-expr-eval.c Thu Mar 3 10:55:21 2005
+@@ -1240,14 +1240,22 @@
static void
eval_padding_expr (FoExprContext *context)
{
@@ -24,7 +24,7 @@
do
{
FoDatatype *intermediate_value = NULL;
-@@ -1349,10 +1357,10 @@
+@@ -1345,10 +1353,10 @@
* A fifth entry on the stack indicates an error.
*/
@@ -37,7 +37,7 @@
/* Handle possible conditions for top stack entry. */
if (stack_first == NULL)
-@@ -1371,7 +1379,7 @@
+@@ -1367,7 +1375,7 @@
}
/* Second stack entry */
@@ -46,7 +46,7 @@
/* Handle possible conditions for second stack entry. */
if (stack_second == NULL)
-@@ -1391,7 +1399,7 @@
+@@ -1387,7 +1395,7 @@
}
/* third stack entry */
@@ -55,7 +55,7 @@
/* Handle possible conditions for third stack entry. */
if (stack_third == NULL)
-@@ -1411,7 +1419,7 @@
+@@ -1407,7 +1415,7 @@
}
/* fourth stack entry */
@@ -64,3 +64,56 @@
/* Handle possible conditions for fourth stack entry. */
if (stack_fourth == NULL)
+@@ -1575,6 +1583,12 @@
+ static void
+ eval_border_color_expr (FoExprContext *context)
+ {
++ FoDatatype *result_datatype = NULL;
++ FoDatatype *stack_first;
++ FoDatatype *stack_second;
++ FoDatatype *stack_third;
++ FoDatatype *stack_fourth;
++
+ /* If not 'inherit', then one to four <color> or 'transparent' values. */
+ do
+ {
+@@ -1658,10 +1672,10 @@
+ * A fifth entry on the stack indicates an error.
+ */
+
+- FoDatatype *result_datatype = NULL;
++ result_datatype = NULL;
+
+ /* First stack entry */
+- FoDatatype *stack_first = fo_expr_context_pop_stack (context);
++ stack_first = fo_expr_context_pop_stack (context);
+
+ /* Handle possible conditions for top stack entry. */
+ if (stack_first == NULL)
+@@ -1680,7 +1694,7 @@
+ }
+
+ /* Second stack entry */
+- FoDatatype *stack_second = fo_expr_context_pop_stack (context);
++ stack_second = fo_expr_context_pop_stack (context);
+
+ /* Handle possible conditions for second stack entry. */
+ if (stack_second == NULL)
+@@ -1700,7 +1714,7 @@
+ }
+
+ /* third stack entry */
+- FoDatatype *stack_third = fo_expr_context_pop_stack (context);
++ stack_third = fo_expr_context_pop_stack (context);
+
+ /* Handle possible conditions for third stack entry. */
+ if (stack_third == NULL)
+@@ -1720,7 +1734,7 @@
+ }
+
+ /* fourth stack entry */
+- FoDatatype *stack_fourth = fo_expr_context_pop_stack (context);
++ stack_fourth = fo_expr_context_pop_stack (context);
+
+ /* Handle possible conditions for fourth stack entry. */
+ if (stack_fourth == NULL)