[Scummvm-git-logs] scummvm master -> 027f85f612e4e58ca45c993ba010eaedb5660556

[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:
027f85f612 ICB: Fix Redundant Declaration Warnings


Commit: 027f85f612e4e58ca45c993ba010eaedb5660556
    https://github.com/scummvm/scummvm/commit/027f85f612e4e58ca45c993ba010eaedb5660556
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T19:43:11Z

Commit Message:
ICB: Fix Redundant Declaration Warnings

These are emitted by GCC if -Wredundant-decls is enabled.

Changed paths:
    engines/icb/common/px_globalvariables.cpp
    engines/icb/common/px_globalvariables.h
    engines/icb/common/px_scriptengine.cpp
    engines/icb/p4_pc.cpp


diff --git a/engines/icb/common/px_globalvariables.cpp b/engines/icb/common/px_globalvariables.cpp
index a84f5dc5bc4..97b1beddeb1 100644
--- a/engines/icb/common/px_globalvariables.cpp
+++ b/engines/icb/common/px_globalvariables.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "engines/icb/p4.h"
+#include "engines/icb/debug_pc.h"
 #include "engines/icb/common/px_globalvariables.h"
 
 namespace ICB {
diff --git a/engines/icb/common/px_globalvariables.h b/engines/icb/common/px_globalvariables.h
index 822ee3abd48..afe120d2734 100644
--- a/engines/icb/common/px_globalvariables.h
+++ b/engines/icb/common/px_globalvariables.h
@@ -33,8 +33,6 @@
 
 namespace ICB {
 
-void Fatal_error(const char *format, ...); // Game engine compatible error routine
-
 #define MAX_global_vars 256
 
 #define GLOBAL_VAR_NOT_SET (0)
diff --git a/engines/icb/common/px_scriptengine.cpp b/engines/icb/common/px_scriptengine.cpp
index 5fa93c87b31..ec099be7654 100644
--- a/engines/icb/common/px_scriptengine.cpp
+++ b/engines/icb/common/px_scriptengine.cpp
@@ -26,6 +26,7 @@
 
 #include "engines/icb/common/ptr_util.h"
 #include "engines/icb/p4.h"
+#include "engines/icb/debug_pc.h"
 #include "engines/icb/common/px_scriptengine.h"
 #include "engines/icb/common/px_common.h"          // common defs for tools & engine
 #include "engines/icb/common/px_globalvariables.h" // The global variable class
@@ -107,8 +108,6 @@ int32 stackPointer = 0;  // Position within stack
 #define UpdatePC                                                                                                                                                                   \
 	{ scriptData = actualScript; }
 
-void Zdebug(const char *, ...); // Debug logging functions
-
 #define ScriptTrace Zdebug
 
 void SetScriptDebugging(bool8) {}
diff --git a/engines/icb/p4_pc.cpp b/engines/icb/p4_pc.cpp
index 39c4a633a62..d3516ca29ca 100644
--- a/engines/icb/p4_pc.cpp
+++ b/engines/icb/p4_pc.cpp
@@ -59,9 +59,6 @@ uint32 SONICS_BUFFER_SIZE;
 // private session data (scripts+objects+walkgrids) : 200KB
 #define PRIVATE_RESMAN_SIZE (400 * 1024)
 
-// local prototypes
-void Mission_and_console();
-
 uint32 getConfigValueWithDefault(const ConfigFile &config, const Common::String &section, const Common::String &key, uint32 defaultValue) {
 	if (scumm_stricmp("MusicVolume", key.c_str()) == 0) {
 		return ConfMan.getInt("music_volume") / 2;