Commit b06a727c authored by Dominik Charousset's avatar Dominik Charousset

Do not set defines twice on MSVC, close #484

parent 31079da1
...@@ -133,7 +133,9 @@ ...@@ -133,7 +133,9 @@
# pragma warning( disable : 4624 ) # pragma warning( disable : 4624 )
# pragma warning( disable : 4800 ) # pragma warning( disable : 4800 )
# pragma warning( disable : 4503 ) # pragma warning( disable : 4503 )
# define NOMINMAX # ifndef NOMINMAX
# define NOMINMAX
# endif // NOMINMAX
#else #else
# define CAF_DEPRECATED # define CAF_DEPRECATED
# define CAF_PUSH_WARNINGS # define CAF_PUSH_WARNINGS
......
...@@ -44,8 +44,12 @@ ...@@ -44,8 +44,12 @@
#include "caf/logger.hpp" #include "caf/logger.hpp"
#ifdef CAF_WINDOWS #ifdef CAF_WINDOWS
# define WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define NOMINMAX # define WIN32_LEAN_AND_MEAN
# endif // WIN32_LEAN_AND_MEAN
# ifndef NOMINMAX
# define NOMINMAX
# endif
# ifdef CAF_MINGW # ifdef CAF_MINGW
# undef _WIN32_WINNT # undef _WIN32_WINNT
# undef WINVER # undef WINVER
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment