--- linuxsampler/trunk/src/network/lscp.y 2021/11/22 16:08:21 4001 +++ linuxsampler/trunk/src/network/lscp.y 2021/11/22 20:06:26 4002 @@ -1306,7 +1306,7 @@ String nextExpectedChars; ///< According to current parser position: sequence of characters expected next for satisfying this grammar symbol. }; -#if HAVE_BISON_MAJ >= 3 // Bison 3.x or younger ... +#if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ) // Bison 3.x or younger ... /** * Must ONLY be called just before a so called "reduce" parser action: @@ -1557,7 +1557,7 @@ for (int i = 0; i < depth; ++i) printf("\t"); printf("(default reduction)\n"); #endif - #if HAVE_BISON_MAJ >= 3 + #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ) if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n, stack)) { #else if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n)) { @@ -1568,7 +1568,7 @@ bool ambigious = expectedSymbols.count(yytname[yyr1[n]]) && expectedSymbols[yytname[yyr1[n]]].nextExpectedChars != nextExpectedChars; - #if HAVE_BISON_MAJ >= 3 + #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ) expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, stack, nextExpectedChars); #else expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, nextExpectedChars); @@ -1700,7 +1700,7 @@ bool ambigious = expectedSymbols.count(yytname[yyr1[rule]]) && expectedSymbols[yytname[yyr1[rule]]].nextExpectedChars != nextExpectedChars; - #if HAVE_BISON_MAJ >= 3 + #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ) expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, stack, nextExpectedChars); #else expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, nextExpectedChars);