svn commit: r801721 - in /commons/sandbox/runtime/trunk/src/main/native/os: unix/time.c win32/time.c

[mturk]

Author: mturk
Date: Thu Aug  6 16:58:19 2009
New Revision: 801721

URL: http://svn.apache.org/viewvc?rev=801721&view=rev
Log:
Fix faulty commit mess

Modified:
    commons/sandbox/runtime/trunk/src/main/native/os/unix/time.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/time.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/time.c?rev=801721&r1=801720&r2=801721&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/time.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/time.c Thu Aug  6 
16:58:19 2009
@@ -23,16 +23,13 @@
 #include "acr_descriptor.h"
 #include "acr_time.h"
 
+#include <sys/time.h>
+
 ACR_DECLARE(acr_time_t) ACR_TimeNow(void)
 {
-    LONGLONG   aprtime = 0;
-    FILETIME   time;
-    SYSTEMTIME st;
-
-    GetSystemTime(&st);
-    SystemTimeToFileTime(&st, &time);
-    FileTimeToAcrTime(&aprtime, &time);
+    struct timeval tv;
 
-    return aprtime; 
+    gettimeofday(&tv, NULL);
+    return tv.tv_sec * ACR_USEC_PER_SEC + tv.tv_usec;
 }
 

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c?rev=801721&r1=801720&r2=801721&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Thu Aug  6 
16:58:19 2009
@@ -23,9 +23,16 @@
 #include "acr_descriptor.h"
 #include "acr_time.h"
 
-/* NB NB NB NB This returns GMT!!!!!!!!!! */
 ACR_DECLARE(acr_time_t) ACR_TimeNow(void)
 {
+    LONGLONG   aprtime = 0;
+    FILETIME   time;
+    SYSTEMTIME st;
 
+    GetSystemTime(&st);
+    SystemTimeToFileTime(&st, &time);
+    FileTimeToAcrTime(&aprtime, &time);
+
+    return aprtime; 
 }