Fix compilation with ICU 68

afontenot · afontenot · commit 3d35a5610c26 · 2021-02-20T00:08:25.000-08:00
nip2 depends on the ICU library via libxml2. ICU released version
68 on 2010-10-28, and switched to using the C99 bool type in its
public headers. nip2 was using "bool" as the name for a gboolean
in the ParseConst struct. This commit renames this to "boolean".
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;
 };

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ TRUE {`
`207`	`207`	`BEGIN BINARY;`
`208`	`208`
`209`	`209`	`yylval.yy_const.type = PARSE_CONST_BOOL;`
`210`		`- yylval.yy_const.val.bool = TRUE;`
	`210`	`+ yylval.yy_const.val.boolean = TRUE;`
`211`	`211`
`212`	`212`	`return( TK_CONST );`
`213`	`213`	`}`
`@@ -216,7 +216,7 @@ FALSE {`
`216`	`216`	`BEGIN BINARY;`
`217`	`217`
`218`	`218`	`yylval.yy_const.type = PARSE_CONST_BOOL;`
`219`		`- yylval.yy_const.val.bool = FALSE;`
	`219`	`+ yylval.yy_const.val.boolean = FALSE;`
`220`	`220`
`221`	`221`	`return( TK_CONST );`
`222`	`222`	`}`