Changeset 2028:d0e8a86a1ff2 in lemon-0.x

Timestamp:

03/31/06 14:51:44 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2667

Message:

MinGW32 compatibility

Location:

lemon

Files:

• bits/mingw32_time.h (added)
• graph_to_eps.h (modified) (1 diff)
• time_measure.h (modified) (2 diffs)

lemon/graph_to_eps.h

@@ -21 +21 @@
 
 #include <sys/time.h>
+
+#ifdef WIN32
+#include <lemon/bits/mingw32_time.h>
+#endif
 
 #include<iostream>

lemon/time_measure.h

@@ -26 +26 @@
 
 #ifdef WIN32
-
-#include <windows.h>
-#include <time.h>
-#include "dos.h"
-
-int gettimeofday(struct timeval * tp, struct timezone *) {
-  SYSTEMTIME      systime;
-
-  if (tp) {
-
-    struct tm tmrec;
-    time_t theTime = time(NULL);
-
-    tmrec = *localtime(&theTime);
-    tp->tv_sec = mktime(&tmrec);
-    GetLocalTime(&systime); /* system time */
-
-    tp->tv_usec = systime.wMilliseconds * 1000;
-
-  }
-
-  return 0;
-
-}
-
-struct tms {
-  long  tms_utime;
-  long  tms_stime;
-  long  tms_cutime;
-  long  tms_cstime;
-};
-
-static long filetime_to_clock(FILETIME *ft)
-{
-  __int64 qw = ft->dwHighDateTime;
-  qw <<= 32;
-  qw |= ft->dwLowDateTime;
-  qw /= 10000;  /* File time ticks at 0.1uS, clock at 1mS */
-  return (long) qw;
-
-}
-
-int times(struct tms *tmbuf)
-{
-  FILETIME create, exit, kernel, user;
-  if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
-    tmbuf->tms_utime = filetime_to_clock(&user);
-    tmbuf->tms_stime = filetime_to_clock(&kernel);
-    tmbuf->tms_cutime = 0;
-    tmbuf->tms_cstime = 0;
-  }
-  else {
-    tmbuf->tms_utime = clock();
-    tmbuf->tms_stime = 0;
-    tmbuf->tms_cutime = 0;
-    tmbuf->tms_cstime = 0;
-  }
-  return 0;
-}
-
-#define _SC_CLK_TCK 1
-
-int sysconf(int)
-{
-  return 1;
-}
-
+#include <lemon/bits/mingw32_time.h>
 #else
 #include <sys/times.h>
@@ -142 +76 @@
     const rtms &getTms() const {return ts;}
 
-    void _reset() 
-    { ts.tms_utime=ts.tms_stime=ts.tms_cutime=ts.tms_cstime=0; real_time=0;}
+    void _reset() { 
+      ts.tms_utime = ts.tms_stime = ts.tms_cutime = ts.tms_cstime = 0; 
+      real_time = 0;
+    }
 
   public: