[Scummvm-git-logs] scummvm master -> 3636af403567cbb678a495a75f1da7e941530297

[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:
3636af4035 BASE: Fix Remaining Macro Definition Warnings


Commit: 3636af403567cbb678a495a75f1da7e941530297
    https://github.com/scummvm/scummvm/commit/3636af403567cbb678a495a75f1da7e941530297
Author: D G Turner (digitall at scummvm.org)
Date: 2022-05-24T02:57:46+01:00

Commit Message:
BASE: Fix Remaining Macro Definition Warnings

These are emitted by GCC when -Wundef is passed.

This could have caused odd behaviour if the WIN32 symbol was defined
as 0 i.e. #ifdef WIN32 code is included for compilation, but #if WIN32
guarded code is excluded, hence #ifdef is used in all cases as per the
existing compile time guards.

Changed paths:
    base/commandLine.cpp


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index fb5398480e7..2df40e176e7 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -1410,7 +1410,7 @@ static void calcMD5Mac(Common::Path &filePath, int32 length) {
 	// We need to split the path into the file name and a SearchSet
 	Common::SearchSet dir;
 	char nativeSeparator = '/';
-#if WIN32
+#ifdef WIN32
 	nativeSeparator = '\\';
 #endif
 	Common::FSNode dirNode(filePath.getParent().toString(nativeSeparator));
@@ -1755,7 +1755,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
 		Common::String filename = settings.getValOrDefault("md5-path", "scummvm");
 		// Assume '/' separator except on Windows if the path contain at least one `\`
 		char sep = '/';
-#if WIN32
+#ifdef WIN32
 		if (filename.contains('\\'))
 			sep = '\\';
 #endif