X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcql.y;h=ed5735da1a9f9f8dac612764d985fdd1c2dc65b0;hp=5af8777fcd0a56a9be6f6e2a4b31a490ea0260db;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=5ae2f74ba9b27bb7e926d5908471ac79371f7823

diff --git a/src/cql.y b/src/cql.y
index 5af8777..ed5735d 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /* bison parser for CQL grammar. */
@@ -16,6 +16,10 @@
 #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>
@@ -49,14 +53,15 @@
 
 #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
 
 %%
@@ -229,7 +234,7 @@ searchTerm:
 
 %%
 
-int yyerror(char *s)
+int yyerror(void *locp, char *s)
 {
     return 0;
 }