[Scummvm-git-logs] scummvm master -> 81fd1d529b6fdec1717e6c37c45b6309b06c97df

[SupSuper]

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:
81fd1d529b COMMON: Fix warnings on mingw build


Commit: 81fd1d529b6fdec1717e6c37c45b6309b06c97df
    https://github.com/scummvm/scummvm/commit/81fd1d529b6fdec1717e6c37c45b6309b06c97df
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-06T03:06:11Z

Commit Message:
COMMON: Fix warnings on mingw build

bits/os_defines.h has #define NOMINMAX 1, which conflicts with the
non-value #define NOMINXMAX in scummsys.h.

In file included from ../scummvm/common/lua/lua.h:12,
                 from ../scummvm/common/lua/ltable.cpp:27:
../scummvm/common/scummsys.h:111: warning: "NOMINMAX" redefined
  111 |   #define NOMINMAX
      |
In file included from C:/msys64/mingw64/include/c++/10.2.0/x86_64-w64-
mingw32/bits/c++config.h:518,
                 from C:/msys64/mingw64/include/c++/10.2.0/cmath:41,
                 from C:/msys64/mingw64/include/c++/10.2.0/math.h:36,
                 from ../scummvm/common/lua/ltable.cpp:21:
C:/msys64/mingw64/include/c++/10.2.0/x86_64-w64-mingw32/bits/
os_defines.h:45: note: this is the location of the previous definition
   45 | #define NOMINMAX 1
      |

Amends commit 88f685217b1c8e7ab2c7a588677ad4744480b4a3.

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index cba63bca95..ccf6930ca8 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -108,7 +108,7 @@
 		#define NOWH
 		#define NOSOUND
 		#define NODRAWTEXT
-		#define NOMINMAX
+		#define NOMINMAX 1
 
 	#endif