scanner: sort out scanner logging functions

[platform/upstream/libxkbcommon.git] / src / xkbcomp / parser-priv.h

diff --git a/src/xkbcomp/parser-priv.h b/src/xkbcomp/parser-priv.h
index 465b19d..0675e55 100644 (file)
--- a/src/xkbcomp/parser-priv.h
+++ b/src/xkbcomp/parser-priv.h
@@ -27,21 +27,18 @@
 #ifndef XKBCOMP_PARSER_PRIV_H
 #define XKBCOMP_PARSER_PRIV_H
 
-struct scanner;
 struct parser_param;
 
+#include "scanner-utils.h"
 #include "parser.h"
 
 int
-scanner_error(YYLTYPE *yylloc, struct scanner *scanner, const char *msg);
-
-int
-_xkbcommon_lex(YYSTYPE *yylval, YYLTYPE *yylloc, struct scanner *scanner);
+_xkbcommon_lex(YYSTYPE *yylval, struct scanner *scanner);
 
 XkbFile *
-parse(struct xkb_context *ctx, void *scanner, const char *map);
+parse(struct xkb_context *ctx, struct scanner *scanner, const char *map);
 
 int
-keyword_to_token(const char *string);
+keyword_to_token(const char *string, unsigned int len);
 
 #endif