[Scummvm-git-logs] scummvm master -> f8e18b81f50a9cd044b003c18729cb2c81104812

[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:
f8e18b81f5 BASE: Fix Redundant Declaration Warnings in Plugin Macros


Commit: f8e18b81f50a9cd044b003c18729cb2c81104812
    https://github.com/scummvm/scummvm/commit/f8e18b81f50a9cd044b003c18729cb2c81104812
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T11:42:19Z

Commit Message:
BASE: Fix Redundant Declaration Warnings in Plugin Macros

These generated GCC Warnings when -Wredundant-decls is enabled.

Changed paths:
    base/plugins.h


diff --git a/base/plugins.h b/base/plugins.h
index 07c128272da..03768f4fec0 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -89,7 +89,7 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
 	PluginObject *g_##ID##_getObject() { \
 		return new PLUGINCLASS(); \
 	} \
-	void dummyFuncToAllowTrailingSemicolon()
+	void dummyFuncToAllowTrailingSemicolon_##ID##_()
 
 #ifdef DYNAMIC_MODULES
 
@@ -113,7 +113,7 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
 			return new PLUGINCLASS(); \
 		} \
 	} \
-	void dummyFuncToAllowTrailingSemicolon()
+	void dummyFuncToAllowTrailingSemicolon_##ID##_()
 
 #endif // DYNAMIC_MODULES