Changeset 1055:60f4aaedb20f in lemon for lemon/bits

Timestamp:

04/12/11 07:52:25 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.2

Parents:

1051:cc9bb4f95ed3 (diff), 1053:64260c0f58eb (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 #418 to branch 1.2

Files:

• lemon/bits/windows.cc (modified) (1 diff)
• lemon/bits/windows.cc (modified) (2 diffs)

lemon/bits/windows.cc

@@ -41 +41 @@
 #include <unistd.h>
 #include <ctime>
+#ifndef WIN32
 #include <sys/times.h>
+#endif
 #include <sys/time.h>
 #endif

lemon/bits/windows.cc

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -99 +99 @@
       GetSystemTime(&time);
       char buf1[11], buf2[9], buf3[5];
-          if (GetDateFormat(MY_LOCALE, 0, &time,
+          if (GetDateFormat(MY_LOCALE, 0, &time,
                         ("ddd MMM dd"), buf1, 11) &&
           GetTimeFormat(MY_LOCALE, 0, &time,