the version of the xbt_os_time() function needs the declaration of the structure...

if the macro HAVE_GETTIMEOFDAY is defined or if we are on a Windows platform compute the timeval and return else use the poor resolution.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4872 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index cd6da0b..1aa4faf 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -22,40 +22,37 @@
 
 double xbt_os_time(void) {
 #ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+#elif defined(WIN32)
+       struct timeval tv;
+#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
+       struct _timeb tm;
 
-  gettimeofday(&tv, NULL);
+       _ftime (&tm);
 
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#elif defined(WIN32)
+       tv.tv_sec = tm.time;
+       tv.tv_usec = tm.millitm * 1000;
 
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-   struct _timeb tm;
-   
-   _ftime (&tm);
-       
-   tv->tv_sec = tm.time;
-   tv->tv_usec = tm.millitm * 1000;
-   
 #  else
-   FILETIME  ft;
-   unsigned __int64 tm;
-   
-   GetSystemTimeAsFileTime (&ft);
-   tm = (unsigned __int64)ft.dwHighDateTime << 32;
-   tm |= ft.dwLowDateTime;
-   tm /=10;
-   tm -= 11644473600000000ULL;
-   
-   tv->tv_sec  = (long) (tm / 1000000L);
-   tv->tv_usec = (long) (tm % 1000000L);
-#endif /* windows version checker */
-               
-   
+       FILETIME  ft;
+       unsigned __int64 tm;
+
+       GetSystemTimeAsFileTime (&ft);
+       tm = (unsigned __int64)ft.dwHighDateTime << 32;
+       tm |= ft.dwLowDateTime;
+       tm /=10;
+       tm -= 11644473600000000ULL;
+
+       tv.tv_sec  = (long) (tm / 1000000L);
+       tv.tv_usec = (long) (tm % 1000000L);
+#  endif /* windows version checker */
+
 #else  /* not windows, no gettimeofday => poor resolution */
-   
-  return (double)(time(NULL));
-#endif /* HAVE_GETTIMEOFDAY? */        
+return (double)(time(NULL));
+#endif /* HAVE_GETTIMEOFDAY? */
+
+return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);   
 }
 
 void xbt_os_sleep(double sec) {