From 2e75cfb05e478f1f6f91c8b80217217696ac2897 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 14 May 2015 10:26:08 +0300 Subject: [PATCH] Removed mingw-gcc warnings --- cds/os/win/thread.h | 4 +++- cds/os/win/timer.h | 4 +++- cds/os/win/topology.h | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cds/os/win/thread.h b/cds/os/win/thread.h index f495e01c..2add6806 100644 --- 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 namespace cds { namespace OS { diff --git a/cds/os/win/timer.h b/cds/os/win/timer.h index 637203e1..8f27b260 100644 --- a/cds/os/win/timer.h +++ b/cds/os/win/timer.h @@ -7,7 +7,9 @@ # error " must be included" #endif -#define NOMINMAX +#ifndef NOMINMAX +# define NOMINMAX +#endif #include //@cond none diff --git a/cds/os/win/topology.h b/cds/os/win/topology.h index e427cc8a..4bda9594 100644 --- a/cds/os/win/topology.h +++ b/cds/os/win/topology.h @@ -8,7 +8,9 @@ #endif #include -#define NOMINMAX +#ifndef NOMINMAX +# define NOMINMAX +#endif #include namespace cds { namespace OS { -- 2.34.1