summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-08-28 18:08:05 +0000
committerChris Wilson <chris+github@qwirx.com>2011-08-28 18:08:05 +0000
commitc25d4b165ed4d81ceb832686ecc568dfa9b84e51 (patch)
tree7ff546792302737ec5ef014fd2f64a8c18539d5d /lib
parentc8d91b7e03a29e737660c4142d73c3dc51b32170 (diff)
Fix potential conflict between WINVERs in Timers.
Diffstat (limited to 'lib')
-rw-r--r--lib/common/Timer.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
index 137ad45f..c0451818 100644
--- a/lib/common/Timer.cpp
+++ b/lib/common/Timer.cpp
@@ -8,12 +8,16 @@
//
// --------------------------------------------------------------------------
+#include "Box.h"
+
#ifdef WIN32
- #define _WIN32_WINNT 0x0500
+# ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x0500
+# elif _WIN32_WINNT < 0x0500
+# error Timers require at least Windows 2000 headers
+# endif
#endif
-#include "Box.h"
-
#include <signal.h>
#include <cstring>