[Scummvm-git-logs] scummvm master -> 0574ad5a55aea37fadc403fdc41b4ce0d8acb275

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0574ad5a55 HYPNO: Really Fix Redundant Declaration in MIS Grammar Parser Code


Commit: 0574ad5a55aea37fadc403fdc41b4ce0d8acb275
    https://github.com/scummvm/scummvm/commit/0574ad5a55aea37fadc403fdc41b4ce0d8acb275
Author: D G Turner (digitall at scummvm.org)
Date: 2022-04-01T22:49:43+01:00

Commit Message:
HYPNO: Really Fix Redundant Declaration in MIS Grammar Parser Code

This is emitted by GCC if -Wredundant-decls is passed.

This now removes the offending code line from the generator source
file so this should now not revert if the generator is run again.

Changed paths:
    engines/hypno/grammar_mis.cpp
    engines/hypno/grammar_mis.y


diff --git a/engines/hypno/grammar_mis.cpp b/engines/hypno/grammar_mis.cpp
index 3210190a0a8..9472a2d20fa 100644
--- a/engines/hypno/grammar_mis.cpp
+++ b/engines/hypno/grammar_mis.cpp
@@ -86,7 +86,6 @@
 #define yyerror	 HYPNO_MIS_xerror
 
 extern int HYPNO_MIS_lex();
-//extern int HYPNO_MIS_parse();
 extern int yylineno;
 
 Common::Array<uint32> *smenu_idx = nullptr;
diff --git a/engines/hypno/grammar_mis.y b/engines/hypno/grammar_mis.y
index 8fa25544cf1..c56e38bfb06 100644
--- a/engines/hypno/grammar_mis.y
+++ b/engines/hypno/grammar_mis.y
@@ -34,7 +34,6 @@
 #define yyerror	 HYPNO_MIS_xerror
 
 extern int HYPNO_MIS_lex();
-extern int HYPNO_MIS_parse();
 extern int yylineno;
 
 Common::Array<uint32> *smenu_idx = nullptr;