aboutsummaryrefslogtreecommitdiffstats
path: root/text2pcap.h
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-02-27 10:52:08 +0100
committerMichael Mann <mmann78@netscape.net>2017-02-27 12:52:36 +0000
commit220772dc19ef8b9c20a919375b47390a794c4e42 (patch)
treef02df344650a40d2d12ae38c627d28f8da8a568e /text2pcap.h
parent4b2a2eb0a4c393dcf29e505ed8f135e9b85fb60e (diff)
text2pcap: fix -Wmacro-redefined warning
With flex 2.6.3, this warning is observed (which causes a build failure when -Werror is not disabled: text2pcap-scanner.c:398:9: warning: 'yywrap' macro redefined [-Wmacro-redefined] #define yywrap() (/*CONSTCOND*/1) ^ text2pcap-scanner.c:76:13: note: previous definition is here #define yywrap yywrap Issue is specific to flex 2.6.3 and resolved upstream at https://github.com/westes/flex/issues/162 Change-Id: I861565f5080f87a9457427e7a63b5d9256c49e85 Reviewed-on: https://code.wireshark.org/review/20294 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'text2pcap.h')
-rw-r--r--text2pcap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/text2pcap.h b/text2pcap.h
index 3ec6b02638..fd3a46202c 100644
--- a/text2pcap.h
+++ b/text2pcap.h
@@ -42,7 +42,7 @@ typedef enum {
int parse_token(token_t token, char *str);
-int yylex(void);
+int text2pcap_lex(void);
#endif