projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
08475a7
..
0675e55
100644
(file)
--- a/
src/xkbcomp/parser-priv.h
+++ b/
src/xkbcomp/parser-priv.h
@@
-27,22
+27,16
@@
#ifndef XKBCOMP_PARSER_PRIV_H
#define XKBCOMP_PARSER_PRIV_H
#ifndef XKBCOMP_PARSER_PRIV_H
#define XKBCOMP_PARSER_PRIV_H
-struct scanner;
struct parser_param;
struct parser_param;
+#include "scanner-utils.h"
#include "parser.h"
int
#include "parser.h"
int
-scanner_error(struct scanner *scanner, const char *msg);
-
-void
-scanner_warn(struct scanner *s, const char *msg);
-
-int
_xkbcommon_lex(YYSTYPE *yylval, struct scanner *scanner);
XkbFile *
_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, unsigned int len);
int
keyword_to_token(const char *string, unsigned int len);