Removed mingw-gcc warnings

diff --git a/cds/os/win/thread.h b/cds/os/win/thread.h
index f495e01cf00a4481f0ebb47d087a05125cb0c5c9..2add6806aa6c7dba4eb08beeef3f2b1e5563f3bf 100644 (file)
--- a/cds/os/win/thread.h
+++ b/cds/os/win/thread.h
@@ -3,7 +3,9 @@
 #ifndef CDSLIB_OS_WIN_THREAD_H
 #define CDSLIB_OS_WIN_THREAD_H
 
-#define NOMINMAX
+#ifndef NOMINMAX
+#   define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace cds { namespace OS {

diff --git a/cds/os/win/timer.h b/cds/os/win/timer.h
index 637203e1eb1e5f96dd0ec0837f6dba79de05c151..8f27b26076e38033c713f403ab141390c85c9512 100644 (file)
--- a/cds/os/win/timer.h
+++ b/cds/os/win/timer.h
@@ -7,7 +7,9 @@
 #   error "<cds/os/timer.h> must be included"
 #endif
 
-#define NOMINMAX
+#ifndef NOMINMAX
+#   define NOMINMAX
+#endif
 #include <windows.h>
 
 //@cond none

diff --git a/cds/os/win/topology.h b/cds/os/win/topology.h
index e427cc8acda85ba1f9bbbc73c7592ed607d0c981..4bda959459235963dcae52d4b9bb3cc85767607a 100644 (file)
--- a/cds/os/win/topology.h
+++ b/cds/os/win/topology.h
@@ -8,7 +8,9 @@
 #endif
 
 #include <cds/details/defs.h>
-#define NOMINMAX
+#ifndef NOMINMAX
+#   define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace cds { namespace OS {