diff -r 861a9d5ff283 -r c5919679af17 lemon/time_measure.h
--- a/lemon/time_measure.h	Fri Jan 23 16:42:07 2009 +0000
+++ b/lemon/time_measure.h	Tue Feb 10 17:37:59 2009 +0000
@@ -24,11 +24,16 @@
 ///\brief Tools for measuring cpu usage
 
 #ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <cmath>
 #else
+#include <unistd.h>
 #include <sys/times.h>
 #include <sys/time.h>
 #endif