libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 10:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BASE: Fix Remaining Macro Definition Warnings

Browse Source 
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.
This commit is contained in:
D G Turner 2022-05-24 02:57:46 +01:00
parent 3eb2cf61e4
commit 3636af4035
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/commandLine.cpp
View File

@ -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