Prevent redefinition of NOMINMAX

While this protection is not strictly necessary here, if someone does a cut-and-paste into a header file it should be included.
2016-04-06 15:22:11 -05:00
parent 0ad8ece840
commit 9a8644033d
4 changed files with 5 additions and 4 deletions
--- a/src/server/beaconEmitter.cpp
+++ b/src/server/beaconEmitter.cpp
@@ -4,7 +4,7 @@
 * in file LICENSE that is included with this distribution.
 */

-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif