From ff6b94d6d089e3def456c4eceecde94bd17b9a5f Mon Sep 17 00:00:00 2001 From: Eamon Nerbonne Date: Tue, 2 Mar 2010 08:46:11 +0100 Subject: [PATCH] BenchTimer: avoid warning about symbol redefinition on win32, and include (required to compile) --- bench/BenchTimer.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bench/BenchTimer.h b/bench/BenchTimer.h index e49afa07f..5e5945b57 100644 --- a/bench/BenchTimer.h +++ b/bench/BenchTimer.h @@ -27,8 +27,12 @@ #define EIGEN_BENCH_TIMERR_H #if defined(_WIN32) || defined(__CYGWIN__) +#ifndef NOMINMAX #define NOMINMAX +#endif +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif #include #else #include @@ -39,6 +43,7 @@ #include #include #include +#include namespace Eigen {