Merged 0.0 changes from revision 2825 to 2898 to trunk.

1 files changed, 14 insertions, 9 deletions

diff --git a/src/log.cpp b/src/log.cpp
index 07eb55f7..3a3c91b8 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -21,7 +21,9 @@
 
 #include "log.h"
 #ifdef WIN32
-#include <windows.h>
+    #include "utils/wingettimeofday.h"
+#else
+    #include <sys/time.h>
 #endif
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
@@ -64,7 +66,6 @@ void Logger::log(const char *log_text, ...)
 
     char* buf = new char[1024];
     va_list ap;
-    time_t t;
 
     // Use a temporary buffer to fill in the variables
     va_start(ap, log_text);
@@ -72,19 +73,23 @@ void Logger::log(const char *log_text, ...)
     va_end(ap);
 
     // Get the current system time
-    time(&t);
+    timeval tv;
+    gettimeofday(&tv, NULL);
 
     // Print the log entry
     std::stringstream timeStr;
     timeStr << "["
-        << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-        << (int)(((t / 60) / 60) % 24)
+        << ((((tv.tv_sec / 60) / 60) % 24 < 10) ? "0" : "")
+        << (int)(((tv.tv_sec / 60) / 60) % 24)
         << ":"
-        << (((t / 60) % 60 < 10) ? "0" : "")
-        << (int)((t / 60) % 60)
+        << (((tv.tv_sec / 60) % 60 < 10) ? "0" : "")
+        << (int)((tv.tv_sec / 60) % 60)
         << ":"
-        << ((t % 60 < 10) ? "0" : "")
-        << (int)(t % 60)
+        << ((tv.tv_sec % 60 < 10) ? "0" : "")
+        << (int)(tv.tv_sec % 60)
+        << "."
+        << (((tv.tv_usec / 10000) % 100) < 10 ? "0" : "")
+        << (int)((tv.tv_usec / 10000) % 100)
         << "] ";
 
     mLogFile << timeStr.str() << buf << std::endl;