[Scummvm-git-logs] scummvm master -> 4491ccb8bde25a7daa79662306ce4a354e0e855c

[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:
4491ccb8bd COMMON: Fix Undefined Macro Warnings in OSystem Header


Commit: 4491ccb8bde25a7daa79662306ce4a354e0e855c
    https://github.com/scummvm/scummvm/commit/4491ccb8bde25a7daa79662306ce4a354e0e855c
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-10T18:47:39Z

Commit Message:
COMMON: Fix Undefined Macro Warnings in OSystem Header

These are emitted by GCC when -Wundef is passed.

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index d2b0e8d30e1..ff832ee9737 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -333,7 +333,7 @@
 //
 #ifndef GCC_PRINTF
 	#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-		#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
+		#if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 			#define GCC_PRINTF(x,y) __attribute__((__format__(__gnu_printf__, x, y)))
 		#else
 			#define GCC_PRINTF(x,y) __attribute__((__format__(__printf__, x, y)))
@@ -344,7 +344,7 @@
 #endif
 
 #ifndef MSVC_PRINTF
-	#if _MSC_VER > 1400
+	#if defined(_MSC_VER) && _MSC_VER > 1400
 		#define MSVC_PRINTF _Printf_format_string_
 	#else
 		#define MSVC_PRINTF