[Scummvm-git-logs] scummvm master -> 5a7481141ae7d72440f318fa76eb802b6f974766

[digitall]

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

Summary:
6ac3d31f47 PRIVATE: Fix Redundant Declaration in Grammar Parser Code
600358f1cc HYPNO: Fix Redundant Declaration in Grammar Parser Code
5a7481141a DIRECTOR: Fix Redundant Declaration in Grammar Parser Code


Commit: 6ac3d31f47b3094ca32a5e31b0d6b98c34516fc4
    https://github.com/scummvm/scummvm/commit/6ac3d31f47b3094ca32a5e31b0d6b98c34516fc4
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-09T10:01:02Z

Commit Message:
PRIVATE: Fix Redundant Declaration in Grammar Parser Code

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

Changed paths:
    engines/private/grammar.cpp


diff --git a/engines/private/grammar.cpp b/engines/private/grammar.cpp
index ff7b8d18327..9132d7cc546 100644
--- a/engines/private/grammar.cpp
+++ b/engines/private/grammar.cpp
@@ -93,7 +93,7 @@ using namespace Gen;
 using namespace Settings;
 
 extern int PRIVATE_lex();
-extern int PRIVATE_parse();
+//extern int PRIVATE_parse();
 
 void PRIVATE_xerror(const char *str) {
     assert(0);


Commit: 600358f1cc35aa56563be734264635313a47b705
    https://github.com/scummvm/scummvm/commit/600358f1cc35aa56563be734264635313a47b705
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-09T10:01:49Z

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

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

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


diff --git a/engines/hypno/grammar_arc.cpp b/engines/hypno/grammar_arc.cpp
index c70677e0fa1..b8b1f1f34a5 100644
--- a/engines/hypno/grammar_arc.cpp
+++ b/engines/hypno/grammar_arc.cpp
@@ -87,7 +87,7 @@
 Hypno::Shoot *shoot;
 
 extern int HYPNO_ARC_lex();
-extern int HYPNO_ARC_parse();
+//extern int HYPNO_ARC_parse();
 extern int HYPNO_ARC_lineno;
 uint32 HYPNO_ARC_default_sound_rate = 0;
 
diff --git a/engines/hypno/grammar_mis.cpp b/engines/hypno/grammar_mis.cpp
index 5ecff6a00c3..3210190a0a8 100644
--- a/engines/hypno/grammar_mis.cpp
+++ b/engines/hypno/grammar_mis.cpp
@@ -86,7 +86,7 @@
 #define yyerror	 HYPNO_MIS_xerror
 
 extern int HYPNO_MIS_lex();
-extern int HYPNO_MIS_parse();
+//extern int HYPNO_MIS_parse();
 extern int yylineno;
 
 Common::Array<uint32> *smenu_idx = nullptr;


Commit: 5a7481141ae7d72440f318fa76eb802b6f974766
    https://github.com/scummvm/scummvm/commit/5a7481141ae7d72440f318fa76eb802b6f974766
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-09T10:02:17Z

Commit Message:
DIRECTOR: Fix Redundant Declaration in Grammar Parser Code

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

Changed paths:
    engines/director/lingo/lingo-gr.h


diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 474d33f4913..92d7bdcf923 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -173,6 +173,6 @@ typedef union YYSTYPE YYSTYPE;
 
 extern YYSTYPE yylval;
 
-int yyparse (void);
+//int yyparse (void);
 
 #endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED  */