# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1324399001 -3600
# Node ID 98ddf8d5fda916dc229353baa5217f931592a004
# Parent  17e36e17572541b7100d7b48e06428e64367110e# Parent  64260c0f58eb25c9bf6563793f7bacbfcc0a14bb
Merge

diff -r 17e36e175725 -r 98ddf8d5fda9 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 20 17:35:45 2011 +0100
+++ b/CMakeLists.txt	Tue Dec 20 17:36:41 2011 +0100
@@ -51,7 +51,7 @@
   SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
 ELSE()
   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
+    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
     SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
     SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
   ELSEIF(MSVC)
diff -r 17e36e175725 -r 98ddf8d5fda9 lemon/bits/windows.cc
--- a/lemon/bits/windows.cc	Tue Dec 20 17:35:45 2011 +0100
+++ b/lemon/bits/windows.cc	Tue Dec 20 17:36:41 2011 +0100
@@ -40,7 +40,9 @@
 #else
 #include <unistd.h>
 #include <ctime>
+#ifndef WIN32
 #include <sys/times.h>
+#endif
 #include <sys/time.h>
 #endif