Merge pull request #31 from rupertsteel/master

Fixed 2 macro redefinition warnings related to WIN32_LEAN_AND_MEAN.
11 years ago · c3f8200ad5
parent 1d8ac6de6d 5d7947df9d
commit c3f8200ad5
2 changed files with 7 additions and 3 deletions
--- 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