Merge pull request #3321

0078841 prevent Windows redefinition warning cause by compat.h (Philip Kaufmann)
2013-11-28 08:41:14 +01:00
parent 5f083afde1 0078841617
commit 4ae42d43a4
1 changed files with 2 additions and 0 deletions
--- a/src/compat.h
+++ b/src/compat.h
@@ -11,7 +11,9 @@
 #undef _WIN32_WINNT
 #endif
 #define _WIN32_WINNT 0x0501
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
+#endif
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif