From 3651eff3d631658b8fcdb30b9d63e0acb66a1204 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 11:24:54 -0700
Subject: [PATCH] cleanup Systime to gettimeofday without lean and mean windows

---
 interface/src/Audio.h                  |  1 -
 interface/src/starfield/Controller.cpp |  1 -
 interface/src/starfield/Generator.cpp  |  1 -
 interface/src/ui/BandwidthMeter.h      |  1 -
 libraries/shared/src/Systime.cpp       | 62 +++++++++++++++++++++-----
 libraries/shared/src/Systime.h         | 23 +++++-----
 6 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index c529fc2651..a0c7398328 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -13,7 +13,6 @@
 #define hifi_Audio_h
 
 #ifdef _WIN32
-#define WANT_TIMEVAL
 #include <Systime.h>
 #endif
 
diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp
index b50c393f00..771029c689 100755
--- a/interface/src/starfield/Controller.cpp
+++ b/interface/src/starfield/Controller.cpp
@@ -10,7 +10,6 @@
 //
 
 #ifdef _WIN32
-#define WANT_TIMEVAL
 #include <Systime.h>
 #endif
 
diff --git a/interface/src/starfield/Generator.cpp b/interface/src/starfield/Generator.cpp
index 15d1736e4e..b18e1834be 100644
--- a/interface/src/starfield/Generator.cpp
+++ b/interface/src/starfield/Generator.cpp
@@ -10,7 +10,6 @@
 //
 
 #ifdef _WIN32
-#define WANT_TIMEVAL
 #include <Systime.h>
 #endif
 
diff --git a/interface/src/ui/BandwidthMeter.h b/interface/src/ui/BandwidthMeter.h
index 45226c8e82..6838f28c70 100644
--- a/interface/src/ui/BandwidthMeter.h
+++ b/interface/src/ui/BandwidthMeter.h
@@ -13,7 +13,6 @@
 #define hifi_BandwidthMeter_h
 
 #ifdef _WIN32
-#define WANT_TIMEVAL
 #include <Systime.h>
 #endif
 
diff --git a/libraries/shared/src/Systime.cpp b/libraries/shared/src/Systime.cpp
index 1fc6778dad..a63336f777 100644
--- a/libraries/shared/src/Systime.cpp
+++ b/libraries/shared/src/Systime.cpp
@@ -1,14 +1,56 @@
-#ifdef _WIN32
+//
+//  Systime.cpp
+//  libraries/shared/src
+//
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/**
+ * gettimeofday
+ * Implementation according to:
+ * The Open Group Base Specifications Issue 6
+ * IEEE Std 1003.1, 2004 Edition
+ */
+  
+/**
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  Contributed by:
+ *  Danny Smith <dannysmith@users.sourceforge.net>
+ */
+
+#include <sys/time.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include "Systime.h"
 
-    int gettimeofday(timeval* p_tv, timezone* p_tz) {
-      int tt = timeGetTime();
+/** Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
+#define _W32_FT_OFFSET (116444736000000000ULL)
 
-      p_tv->tv_sec = tt / 1000;
-      p_tv->tv_usec = tt % 1000 * 1000;
-      return 0;
-    }
-    
-#endif
+int __cdecl gettimeofday(struct timeval *__restrict__ tp,
+			 void *__restrict__ tzp __attribute__((unused))) {
+  union {
+    unsigned long long ns100; /**time since 1 Jan 1601 in 100ns units */
+    FILETIME ft;
+  }  _now;
+
+  if (tp) {
+      GetSystemTimeAsFileTime (&_now.ft);
+      tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
+      tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
+  }
+  
+  /** Always return 0 as per Open Group Base Specifications Issue 6.
+     Do not set errno on error.  */
+  return 0;
+}
\ No newline at end of file
diff --git a/libraries/shared/src/Systime.h b/libraries/shared/src/Systime.h
index 5d96b53e7a..07d467e63d 100644
--- a/libraries/shared/src/Systime.h
+++ b/libraries/shared/src/Systime.h
@@ -1,17 +1,16 @@
+//
+//  Systime.h
+//  libraries/shared/src
+//
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
 #ifndef __Systime__
 #define __Systime__
 
-#ifdef _WIN32
-
 #include <winsock2.h>
 
-struct timezone {
-  int tz_minuteswest; /* minutes west of Greenwich */
-  int tz_dsttime; /* type of dst correction */
-};
-
-int gettimeofday(struct timeval* p_tv, struct timezone* p_tz);
-
-#endif _Win32
-
-#endif __Systime__
+#endif __Systime__
\ No newline at end of file