From: Augustin Degomme Date: Tue, 24 Sep 2013 14:57:44 +0000 (+0200) Subject: first attempt to fix win build X-Git-Tag: v3_9_90~91^2~10^2~7 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/acbb008dc3d00fd042fa186fba318ac338ba7c38?ds=inline first attempt to fix win build --- diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index f0d4387e53..6f5f81e533 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -253,7 +253,7 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start)); #elif defined(_XBT_WIN32) timer->elapse.tv_sec = 0; - timer->elapse.tv_nsec = 0; + timer->elapse.tv_usec = 0; # if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) THROW_UNIMPLEMENTED; # else @@ -281,7 +281,7 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start)); #elif defined(_XBT_WIN32) timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec; - timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec; + timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec; # if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) THROW_UNIMPLEMENTED; # else @@ -361,7 +361,7 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer) clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->start)); #elif defined(_XBT_WIN32) timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec; - timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec; + timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec; # if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) THROW_UNIMPLEMENTED; # else