Merge pull request #31 from rupertsteel/master

Fixed 2 macro redefinition warnings related to WIN32_LEAN_AND_MEAN.

Merge pull request #31 from rupertsteel/master
Fixed 2 macro redefinition warnings related to WIN32_LEAN_AND_MEAN.
c3f8200a · Gabi Melman · 1d8ac6de · 5d7947df · c3f8200a · c3f8200a
Commit c3f8200a authored Jan 12, 2015 by Gabi Melman
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

include/spdlog/details/format.cc include/spdlog/details/format.cc +3 -1

include/spdlog/details/os.h include/spdlog/details/os.h +4 -2

No files found.
--- a/include/spdlog/details/format.cc
+++ b/include/spdlog/details/format.cc
@@ -39,7 +39,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdarg>

 #ifdef _WIN32
-# define WIN32_LEAN_AND_MEAN
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # ifdef __MINGW32__
 #  include <cstring>
 # endif

--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -29,8 +29,10 @@
 #include<ctime>

 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <Windows.h>
 #endif

 namespace spdlog