From 1906a7b47dace1fdf28ae3b06b22f2ebd4b5609d Mon Sep 17 00:00:00 2001 From: Dmitri Zutskov Date: Sat, 12 Oct 2013 00:08:29 +0300 Subject: [PATCH 1/2] minimize dependencies from windows.h #include before the winsock2 generates large amount of redefinition errors originating from conflicts between winsock.h and winsock2.h. Root cause is winsock.h included from the windows.h --- bandit/reporters/colorizer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/bandit/reporters/colorizer.h b/bandit/reporters/colorizer.h index 9a56809..23b2531 100644 --- a/bandit/reporters/colorizer.h +++ b/bandit/reporters/colorizer.h @@ -2,6 +2,7 @@ #define BANDIT_REPORTERS_COLORIZER_H #ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN #include #endif From f38ee3f03558026a8f3c82b750d22ebb80c0de9a Mon Sep 17 00:00:00 2001 From: Dmitri Zutskov Date: Sat, 12 Oct 2013 00:33:30 +0300 Subject: [PATCH 2/2] windows.h brakes std:min std:max --- bandit/reporters/colorizer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/bandit/reporters/colorizer.h b/bandit/reporters/colorizer.h index 23b2531..661889c 100644 --- a/bandit/reporters/colorizer.h +++ b/bandit/reporters/colorizer.h @@ -2,6 +2,7 @@ #define BANDIT_REPORTERS_COLORIZER_H #ifdef _WIN32 + #define NOMINMAX #define WIN32_LEAN_AND_MEAN #include #endif