[Scummvm-git-logs] scummvm master -> 55e3c26cd07d41671f2da9f9102e4738daaad751

[mduggan]

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:
55e3c26cd0 ULTIMA4: Fix compile warning about redefining DBL_MAX


Commit: 55e3c26cd07d41671f2da9f9102e4738daaad751
    https://github.com/scummvm/scummvm/commit/55e3c26cd07d41671f2da9f9102e4738daaad751
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-26T16:06:50+09:00

Commit Message:
ULTIMA4: Fix compile warning about redefining DBL_MAX

Changed paths:
    engines/ultima/ultima4/gfx/screen.cpp


diff --git a/engines/ultima/ultima4/gfx/screen.cpp b/engines/ultima/ultima4/gfx/screen.cpp
index 167dfd6f7a..cb153e0a97 100644
--- a/engines/ultima/ultima4/gfx/screen.cpp
+++ b/engines/ultima/ultima4/gfx/screen.cpp
@@ -48,7 +48,9 @@ namespace Ultima {
 namespace Ultima4 {
 
 #define MOUSE_CURSOR_SIZE 20
+#ifndef DBL_MAX
 #define DBL_MAX 1e99
+#endif
 #define BUFFER_SIZE 1024
 
 Screen *g_screen;