diff options
| author | Michael Dankov <tryagain@navit-project.org> | 2015-09-08 01:30:18 +0300 |
|---|---|---|
| committer | Michael Dankov <tryagain@navit-project.org> | 2015-09-08 01:30:18 +0300 |
| commit | 7b8158e05d05ea9cc4b03e72eee73ca5bddba763 (patch) | |
| tree | 28b5e5677c92890d8693875c358ed33af0eabed0 | |
| parent | ccc7bc6c3503fe8e9e47afe853a3012ae2749f67 (diff) | |
| download | navit-R6255.tar.gz | |
Fix maptool build for Win32R6255
Fallback to not Async signal safe gettimeofday on WIN32, which
does not support neither async signals nor clock_gettime.
| -rw-r--r-- | navit/maptool/maptool.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c index cb16d9f74..765d6abf7 100644 --- a/navit/maptool/maptool.c +++ b/navit/maptool/maptool.c @@ -72,6 +72,9 @@ int overlap=1; int bytes_read; static long start_brk; +#ifdef _WIN32 +#define timespec timeval +#endif static struct timespec start_ts; /* @@ -128,7 +131,11 @@ progress_time(void) char buf[buflen]; int pos=1; buf[0]=' '; +#ifdef _WIN32 + gettimeofday(&ts, NULL); +#else clock_gettime(CLOCK_REALTIME, &ts); +#endif seconds=ts.tv_sec-start_ts.tv_sec; pos+=assafe_lltoa(seconds/60, buflen-pos, buf+pos); seconds%=60; @@ -153,13 +160,6 @@ progress_memory(void) } void -sig_alrm(int sig) -{ - fflush(stderr); - sig_alrm_do(sig); -} - -void sig_alrm_do(int sig) { const int buflen=1024; @@ -192,6 +192,14 @@ sig_alrm_do(int sig) #endif } +void +sig_alrm(int sig) +{ + fflush(stderr); + sig_alrm_do(sig); +} + + void sig_alrm_end(void) @@ -935,8 +943,11 @@ int main(int argc, char **argv) #ifdef HAVE_SBRK start_brk=(long)sbrk(0); #endif +#ifdef _WIN32 + gettimeofday(&start_ts,NULL); +#else clock_gettime(CLOCK_REALTIME, &start_ts); - +#endif while (1) { int parse_result=parse_option(&p, argv, argc, &option_index); if (!parse_result) { |