feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fix potential double-definition of WIN32_LEAN_AND_MEAN macro

Browse Source
This commit is contained in:
Scott Ramsby
2018-11-09 16:08:07 -08:00
parent 38afecb48b
commit f4e1ff192f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/regex.cpp
View File

@ -28,7 +28,9 @@
# include <malloc.h> # include <malloc.h>
#endif #endif
#ifdef BOOST_REGEX_HAS_MS_STACK_GUARD #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif

2
src/static_mutex.cpp
View File

@ -28,7 +28,9 @@
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#endif #endif

2
src/w32_regex_traits.cpp
View File

@ -23,7 +23,9 @@
#include <boost/regex/regex_traits.hpp> #include <boost/regex/regex_traits.hpp>
#include <boost/regex/pattern_except.hpp> #include <boost/regex/pattern_except.hpp>
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
#endif #endif