diff options
Diffstat (limited to 'epan/protobuf_lang_scanner.l')
| -rw-r--r-- | epan/protobuf_lang_scanner.l | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/protobuf_lang_scanner.l b/epan/protobuf_lang_scanner.l index dca3d79749..335d960397 100644 --- a/epan/protobuf_lang_scanner.l +++ b/epan/protobuf_lang_scanner.l @@ -1,6 +1,7 @@ %top { /* Include this before everything else, for various large-file definitions */ #include "config.h" +#include <wireshark.h> } /* @@ -57,14 +58,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <glib.h> #include "protobuf_lang_tree.h" #include "protobuf_lang_parser.h" /* * Disable diagnostics in the code generated by Flex. */ -DIAG_OFF_FLEX +DIAG_OFF_FLEX() /* * Sleazy hack to suppress compiler warnings in yy_fatal_error(). @@ -167,8 +167,8 @@ to PROTOBUF_LANG_PARSE(PT_TO); /* Using extended identifier because we care only about position */ [a-zA-Z0-9_.][a-zA-Z0-9_.+-]* PROTOBUF_LANG_PARSE(PT_IDENT); -\"(\\.|\"\"|[^"\n"])*\" PROTOBUF_LANG_PARSE(PT_STRLIT); -\'(\\.|\'\'|[^"\n"])*\' PROTOBUF_LANG_PARSE(PT_STRLIT); +\"(\'|\\.|\"\"|[^"\n"])*\" PROTOBUF_LANG_PARSE(PT_STRLIT); +\'(\"|\\.|\'\'|[^"\n"])*\' PROTOBUF_LANG_PARSE(PT_STRLIT); /* comments */ "//"[^\r\n]* @@ -191,4 +191,4 @@ strdup_and_store(void* yyscanner, const char* text) { /* * Turn diagnostics back on, so we check the code that we've written. */ -DIAG_ON_FLEX +DIAG_ON_FLEX() |