From ea5c45b911d33982aad73ffde43379141f0e45f7 Mon Sep 17 00:00:00 2001
From: petermcs <petermcs@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Fri, 22 Jan 2010 15:07:21 +0000
Subject: [PATCH] Updated time code changes to compile with Visual Studio
 Express 2008.

---
 bacnet-stack/demo/object/device.c | 19 +++++++++++++++++++
 bacnet-stack/ports/win32/timer.h  |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 94f8e0db..bb7a9516 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -497,7 +497,11 @@ char *Device_Valid_Object_Id(
 static void Update_Current_Time(void)
 {
     struct tm *tblock = NULL;
+    #if defined(_MSC_VER)
+    time_t tTemp;
+    #else
     struct timeval tv;
+    #endif
 /*
 struct tm
     
@@ -511,21 +515,36 @@ int    tm_wday  Day of week [0,6] (Sunday =0).
 int    tm_yday  Day of year [0,365]. 
 int    tm_isdst Daylight Savings flag. 
 */
+    #if defined(_MSC_VER)
+    time(&tTemp);
+    tblock = localtime(&tTemp);
+    #else
     if (gettimeofday(&tv, NULL) == 0) { 
         tblock = localtime(&tv.tv_sec);
     }
+    #endif
+    
     if (tblock) {
         datetime_set_date(
             &Local_Date,
             (uint16_t) tblock->tm_year+1900,
             (uint8_t) tblock->tm_mon+1, 
             (uint8_t) tblock->tm_mday);
+        #if !defined(_MSC_VER)
         datetime_set_time(
             &Local_Time,
             (uint8_t) tblock->tm_hour, 
             (uint8_t) tblock->tm_min,
             (uint8_t) tblock->tm_sec, 
             (uint8_t)(tv.tv_usec / 10000));
+        #else
+        datetime_set_time(
+            &Local_Time,
+            (uint8_t) tblock->tm_hour, 
+            (uint8_t) tblock->tm_min,
+            (uint8_t) tblock->tm_sec, 
+            0);
+        #endif
         if (tblock->tm_isdst) {
             Daylight_Savings_Status = true;
         } else {
diff --git a/bacnet-stack/ports/win32/timer.h b/bacnet-stack/ports/win32/timer.h
index 80329e6a..44cf23b4 100644
--- a/bacnet-stack/ports/win32/timer.h
+++ b/bacnet-stack/ports/win32/timer.h
@@ -33,8 +33,10 @@
 #if defined(__BORLANDC__)
 #include <winsock2.h>
 #else
+#if !defined(_MSC_VER)
 #include <sys/time.h>
 #endif
+#endif
 #include <sys/timeb.h>
 #if defined(__BORLANDC__)
 #define _timeb timeb