Changeset 556:c5919679af17 in lemon for lemon/time_measure.h

Timestamp:

02/10/09 18:37:59 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

555:861a9d5ff283 (diff), 509:daddd623ac9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• lemon/time_measure.h (modified) (1 diff)
• lemon/time_measure.h (modified) (1 diff)

lemon/time_measure.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2009
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).

lemon/time_measure.h

@@ -25 +25 @@
 
 #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>