From 7b48a1f4557fb51f411d9d4e7a0d44f40533872a Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Thu, 10 Sep 2015 00:55:39 -0400
Subject: [PATCH] Windows Timer fixes

---
 src/util/Timer.cpp | 9 ++++++---
 src/util/Timer.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/util/Timer.cpp b/src/util/Timer.cpp
index b45812b..bc6de22 100644
--- a/src/util/Timer.cpp
+++ b/src/util/Timer.cpp
@@ -1,13 +1,14 @@
 
 #include "Timer.h"
 
-#ifdef WIN32
+#ifdef _WIN32
+	#include <windows.h>
 	#include <mmsystem.h>
 #endif
 
 #include <iostream>
 
-Timer::Timer(void) : time_elapsed(0), system_milliseconds(0), start_time(0), end_time(0), last_update(0), num_updates(0), paused_time(0), offset(0), paused_state(false), lock_state(0), lock_rate(0)
+Timer::Timer(void) : time_elapsed(0), system_milliseconds(0), start_time(0), end_time(0), last_update(0), num_updates(0), paused_time(0), offset(0), paused_state(false), lock_state(false), lock_rate(0)
 {
 }
 
@@ -77,8 +78,10 @@ void Timer::update(void)
 	}
 	else
 	{
-#ifdef WIN32
+#ifdef _WIN32
+
 		system_milliseconds = timeGetTime ();
+
 #else
 		gettimeofday(&time_val,&time_zone);
 
diff --git a/src/util/Timer.h b/src/util/Timer.h
index 554face..18ab841 100644
--- a/src/util/Timer.h
+++ b/src/util/Timer.h
@@ -24,7 +24,7 @@ private:
     unsigned long paused_time;
     unsigned long offset;
 
-#ifndef WIN32
+#ifndef _WIN32
     struct timeval time_val;
     struct timezone time_zone;
 #endif