projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning when GNUTLS is not in use
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
0757724
..
ed5735d
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-16,6
+16,10
@@
#endif
#include <stdio.h>
#include <stdlib.h>
#endif
#include <stdio.h>
#include <stdlib.h>
+/* avoid that bison stuff defines malloc/free - already in stdlib.h */
+#ifdef _MSC_VER
+#define _STDLIB_H 1
+#endif
#include <string.h>
#include <yaz/yaz-iconv.h>
#include <yaz/xmalloc.h>
#include <string.h>
#include <yaz/yaz-iconv.h>
#include <yaz/xmalloc.h>
@@
-49,14
+53,15
@@
#define YYSTYPE token
#define YYSTYPE token
-#define YYPARSE_PARAM parm
-#define YYLEX_PARAM parm
+int yylex(YYSTYPE *lval, void *vp);
+int yyerror(void *lval, char *msg);
- int yylex(YYSTYPE *lval, void *vp);
- int yyerror(char *s);
%}
%}
-%pure_parser
+
+%lex-param {void *parm}
+%parse-param {void *parm}
+%pure-parser
%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
@@
-229,7
+234,7
@@
searchTerm:
%%
%%
-int yyerror(char *s)
+int yyerror(void *locp, char *s)
{
return 0;
}
{
return 0;
}