diff --git a/ChangeLog b/ChangeLog index d7c3a0d..5cdabb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +started 8.9.1 15/2/23 +- fix build with --std=c99 [Schamschula] + started 8.9.0 10/4/20 - add find_trim diff --git a/configure.ac b/configure.ac index 02e0520..e3b412c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([nip2], [8.9.0], [vipsip@jiscmail.ac.uk]) +AC_INIT([nip2], [8.9.1], [vipsip@jiscmail.ac.uk]) # foreign stops complaints about a missing README (we use README.md instead) # and missing INSTALL (the standard Gnu INSTALL is not very useful) @@ -17,7 +17,7 @@ dnl m4_define([nip_major_version], [8]) m4_define([nip_minor_version], [9]) -m4_define([nip_micro_version], [0]) +m4_define([nip_micro_version], [1]) m4_define([nip_version], [nip_major_version.nip_minor_version.nip_micro_version]) diff --git a/src/compile.c b/src/compile.c index 2d341db..ecf40b8 100644 --- 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.boolean ); + PEPUTP( out, ELEMENT_BOOL, pn->con.val.bol ); break; case PARSE_CONST_ELIST: @@ -2523,7 +2523,7 @@ compile_pattern_condition( Compile *compile, int i; n.type = PARSE_CONST_BOOL; - n.val.boolean = TRUE; + n.val.bol = TRUE; node = tree_const_new( compile, n ); for( i = depth - 1; i >= 0; i-- ) { diff --git a/src/lex.l b/src/lex.l index de8a152..9cfc2e9 100644 --- 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.boolean = TRUE; + yylval.yy_const.val.bol = TRUE; return( TK_CONST ); } @@ -216,7 +216,7 @@ FALSE { BEGIN BINARY; yylval.yy_const.type = PARSE_CONST_BOOL; - yylval.yy_const.val.boolean = FALSE; + yylval.yy_const.val.bol = FALSE; return( TK_CONST ); } diff --git a/src/tree.h b/src/tree.h index 9238a99..8a764bb 100644 --- a/src/tree.h +++ b/src/tree.h @@ -126,7 +126,7 @@ struct _ParseConst { union { double num; char *str; - gboolean boolean; + gboolean bol; int ch; } val; };