aboutsummaryrefslogtreecommitdiffstats
path: root/ws_diag_control.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-11-18 17:39:19 -0800
committerAndersBroman <a.broman58@gmail.com>2020-11-30 08:15:43 +0000
commitf21cd2e23f372bd42e4792ef0b4294d2db881a92 (patch)
tree8b02f94f57b8e077ba91e899e8a2046abab18945 /ws_diag_control.h
parent1fa5687fad88963b8a4857a856981da8cc304678 (diff)
wiretap: Convert ascend.y to Lemon.
Convert wiretap/ascend.y.in from Bison/YACC to Lemon and rename it to wiretap/ascend_parser.lemon. Tighten up some of our scanning and parsing. Make the indentation in it and related files consistent. Aside from the recent IPv4 fragment offset changes, this produces identical output to the 3.4 branch for the Ascend trace files I have here. Remove the comment about supporting other commands. Another timeline might have an Ascend that successfully pivoted to DSL or 15625B+1D gigabit ISDN, but this one has neither. This was our last/only Bison/YACC file, so remove Bison/YACC as a development and packaging dependency and remove references to it from the documentation.
Diffstat (limited to 'ws_diag_control.h')
-rw-r--r--ws_diag_control.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/ws_diag_control.h b/ws_diag_control.h
index 52799f540b..6f6aebad61 100644
--- a/ws_diag_control.h
+++ b/ws_diag_control.h
@@ -149,13 +149,6 @@ extern "C" {
__pragma(warning(disable:6387)) \
__pragma(warning(disable:28182))
#define DIAG_ON_FLEX __pragma(warning(pop))
-
- /*
- * XXX - is there an issue with shadowed definitions with MSVC if
- * somebody were to happen to use Berkeley YACC rather than Bison?
- */
- #define DIAG_OFF_BYACC
- #define DIAG_ON_BYACC
#else
/*
* Suppress:
@@ -191,28 +184,6 @@ extern "C" {
#define DIAG_ON_FLEX \
DIAG_ON(sign-compare)
#endif
-
- /*
- * Berkeley YACC and, apparently, some versions of Bison, such as the
- * one in Fedora 21, generate a global declaration of yylval, or the
- * appropriately prefixed version of yylval, in grammar.h, *even
- * though it's been told to generate a pure parser, meaning it
- * doesn't have any global variables*. Other versions of Bison, such
- * as the one in macOS Sierra don't do that.
- *
- * That causes a warning due to the local declaration in the parser
- * shadowing the global declaration.
- *
- * So, if we have _Pragma, and have pragmas to suppress diagnostics,
- * we use it to turn off -Wshadow warnings.
- *
- * XXX - do this for Bison only in versions of Bison with this
- * problem?
- */
- #define DIAG_OFF_BYACC \
- DIAG_OFF(shadow)
- #define DIAG_ON_BYACC \
- DIAG_ON(shadow)
#endif
/*