Merge branch 'master' into 'master'

MIFF: return an int instead...bools aren't valid in this lex file, but ints are.…

…..which can eval in if statements properly...fixes clang compilation

See merge request !5
This commit is contained in:
DarthArgus
2015-10-12 17:41:49 -04:00
@@ -39,7 +39,7 @@ int yyparse();
int MIFFYYInput(char *buf,int max_size);
void initParser(void);
void count(void);
void yyerror(char *err);
int yyerror(char *err);
void open_brace(void);
void close_brace(void);
int count_brace(void);
@@ -374,7 +374,7 @@ void initParser(void)
/*-------------------------------------------------**
** generate a dialog box to MFC to report an error **
**-------------------------------------------------*/
void yyerror(char *err) /* called by yyparse() */
int yyerror(char *err) /* called by yyparse() */
{
char myString[256];