# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1302587194 -7200
# Node ID 632a72b27123e706d6b205cf0fcf741ae281e479
# Parent  c1e8f63421492b312be85e58c51f437b2bdf734f# Parent  64260c0f58eb25c9bf6563793f7bacbfcc0a14bb
Merge #418 to branch 1.1

diff -r c1e8f6342149 -r 632a72b27123 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 17 18:12:57 2011 +0100
+++ b/CMakeLists.txt	Tue Apr 12 07:46:34 2011 +0200
@@ -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 c1e8f6342149 -r 632a72b27123 lemon/bits/windows.cc
--- a/lemon/bits/windows.cc	Thu Mar 17 18:12:57 2011 +0100
+++ b/lemon/bits/windows.cc	Tue Apr 12 07:46:34 2011 +0200
@@ -40,7 +40,9 @@
 #else
 #include <unistd.h>
 #include <ctime>
+#ifndef WIN32
 #include <sys/times.h>
+#endif
 #include <sys/time.h>
 #endif