diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-05-07 10:53:18 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-05-07 10:53:18 +0200 |
| commit | f103bfb9baddcd5ff16e610bc314c3de9eb3d526 (patch) | |
| tree | 14bbe962ab6e3e11727848298fd138d0b1fa27e0 /kernel | |
| parent | c3f6e0ea851b90b11671015f2bb472c857f0e2d9 (diff) | |
| download | yosys-f103bfb9baddcd5ff16e610bc314c3de9eb3d526.tar.gz yosys-f103bfb9baddcd5ff16e610bc314c3de9eb3d526.tar.bz2 yosys-f103bfb9baddcd5ff16e610bc314c3de9eb3d526.zip | |
Fixes for MXE build
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/log.h | 14 | ||||
| -rw-r--r-- | kernel/yosys.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kernel/log.h b/kernel/log.h index c265bae42..33e624dcb 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -163,11 +163,13 @@ struct PerformanceTimer } static int64_t query() { -#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) +# if _WIN32 + return 0; +# elif defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) struct timespec ts; clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); return int64_t(ts.tv_sec)*1000000000 + ts.tv_nsec; -#elif defined(RUSAGE_SELF) +# elif defined(RUSAGE_SELF) struct rusage rusage; int64_t t; if (getrusage(RUSAGE_SELF, &rusage) == -1) { @@ -177,11 +179,9 @@ struct PerformanceTimer t = 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL; t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL; return t; -#elif _WIN32 - return 0; -#else - #error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?). -#endif +# else +# error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?). +# endif } void reset() { diff --git a/kernel/yosys.h b/kernel/yosys.h index c8bc46b65..cc15ca47c 100644 --- a/kernel/yosys.h +++ b/kernel/yosys.h @@ -91,9 +91,9 @@ # define mkdir _mkdir # define popen _popen # define pclose _pclose -# define PATH_MAX MAX_PATH # ifndef __MINGW32__ +# define PATH_MAX MAX_PATH # define isatty _isatty # define fileno _fileno # endif |