Skip to content

S
spdlog
Commit c3f8200a authored by Gabi Melman's avatar Gabi Melman
Browse files
Options

Merge pull request #31 from rupertsteel/master 

Fixed 2 macro redefinition warnings related to WIN32_LEAN_AND_MEAN.
parents 1d8ac6de 5d7947df
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
include/spdlog/details/format.cc
View file @ c3f8200a
...@@ -39,7 +39,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -39,7 +39,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdarg> #include <cstdarg>
#ifdef _WIN32 #ifdef _WIN32
# define WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# ifdef __MINGW32__ # ifdef __MINGW32__
# include <cstring> # include <cstring>
# endif # endif
......
include/spdlog/details/os.h
View file @ c3f8200a
...@@ -29,8 +29,10 @@ ...@@ -29,8 +29,10 @@
#include<ctime> #include<ctime>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
#include <Windows.h> # define WIN32_LEAN_AND_MEAN
# endif
# include <Windows.h>
#endif #endif
namespace spdlog namespace spdlog
......
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