Merge pull request #96 from afontenot/master

Fix compilation with ICU 68
libvips · Apr 11, 2022 · 8bdb145 · 8bdb145
2 parents c924df0 + 3d35a56
commit 8bdb145
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/compile.c b/src/compile.c
@@ -815,7 +815,7 @@ compile_graph( Compile *compile, ParseNode *pn, PElement *out )
 			break;
 
 		case PARSE_CONST_BOOL:
-			PEPUTP( out, ELEMENT_BOOL, pn->con.val.bool );
+			PEPUTP( out, ELEMENT_BOOL, pn->con.val.boolean );
 			break;
 
 		case PARSE_CONST_ELIST:
@@ -2523,7 +2523,7 @@ compile_pattern_condition( Compile *compile,
 	int i;
 
 	n.type = PARSE_CONST_BOOL;
-	n.val.bool = TRUE;
+	n.val.boolean = TRUE;
 	node = tree_const_new( compile, n );
 
 	for( i = depth - 1; i >= 0; i-- ) {

diff --git a/src/lex.l b/src/lex.l
@@ -207,7 +207,7 @@ TRUE {
 	BEGIN BINARY;
 
 	yylval.yy_const.type = PARSE_CONST_BOOL;
-	yylval.yy_const.val.bool = TRUE;
+	yylval.yy_const.val.boolean = TRUE;
 
 	return( TK_CONST );
 }
@@ -216,7 +216,7 @@ FALSE {
 	BEGIN BINARY;
 
 	yylval.yy_const.type = PARSE_CONST_BOOL;
-	yylval.yy_const.val.bool = FALSE;
+	yylval.yy_const.val.boolean = FALSE;
 
 	return( TK_CONST );
 }

diff --git a/src/tree.h b/src/tree.h
@@ -126,7 +126,7 @@ struct _ParseConst {
 	union {
 		double num;
 		char *str;
-		gboolean bool;
+		gboolean boolean;
 		int ch;
 	} val;
 };