Fix some minor warnings about HMONITOR_DECLARED being redefined

OpenSmalltalk · Sep 19, 2024 · 223080a · 223080a
1 parent 9ea29e2
commit 223080a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/platforms/win32/vm/sqWin32DirectInput.c b/platforms/win32/vm/sqWin32DirectInput.c
@@ -34,8 +34,10 @@
 #include <ole2.h>
 #include "sq.h"
 #ifdef __MINGW32__
-#define HMONITOR_DECLARED
-#undef WINNT
+# ifndef HMONITOR_DECLARED
+#	define HMONITOR_DECLARED
+# endif
+# undef WINNT
 #endif
 
 #include <dinput.h>

diff --git a/platforms/win32/vm/sqWin32GUID.c b/platforms/win32/vm/sqWin32GUID.c
@@ -3,8 +3,10 @@
 #include <Windows.h>
 
 #ifdef __MINGW32__
-#define HMONITOR_DECLARED
-#undef WINNT
+# ifndef HMONITOR_DECLARED
+#	define HMONITOR_DECLARED
+# endif
+# undef WINNT
 #endif
 
 #include <ddraw.h>
@@ -13,5 +15,3 @@
 #include <d3d.h>
 #include <dinput.h>
 #include <unknwn.h>
-
-
diff --git a/platforms/win32/vm/sqWin32Window.c b/platforms/win32/vm/sqWin32Window.c
@@ -20,6 +20,7 @@
 *       Option  -> Right ALT
 *
 *****************************************************************************/
+
 #include <Windows.h>
 #include <windowsx.h>
 #include <dbt.h>
@@ -43,7 +44,9 @@
 /** Not needed in cygwin **/
 # define COMPILE_MULTIMON_STUBS
 # undef SM_CMONITORS
-# define HMONITOR_DECLARED
+# ifndef HMONITOR_DECLARED
+#	define HMONITOR_DECLARED
+# endif
 # include "multimon.h"
 #endif /* defined(__MINGW32_VERSION) && (__MINGW32_MAJOR_VERSION < 3) */