Skip to content

Commit

Permalink
fix build with c99
Browse files Browse the repository at this point in the history
see #104
  • Loading branch information
jcupitt committed Feb 15, 2023
1 parent 8bdb145 commit 1d6233b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions 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

Expand Down
4 changes: 2 additions & 2 deletions 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)
Expand All @@ -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])

Expand Down
4 changes: 2 additions & 2 deletions src/compile.c
Expand Up @@ -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:
Expand Down Expand Up @@ -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-- ) {
Expand Down
4 changes: 2 additions & 2 deletions src/lex.l
Expand Up @@ -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 );
}
Expand All @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion src/tree.h
Expand Up @@ -126,7 +126,7 @@ struct _ParseConst {
union {
double num;
char *str;
gboolean boolean;
gboolean bol;
int ch;
} val;
};
Expand Down

0 comments on commit 1d6233b

Please sign in to comment.