From ba6f861ad8b4cadcfc9ff54f61b4cdfa16032f0b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 09:54:37 -0700
Subject: [PATCH] fix unmatched #ifdef in Syssocket

---
 libraries/networking/src/Syssocket.h | 3 ---
 libraries/shared/src/SharedUtil.cpp  | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/networking/src/Syssocket.h b/libraries/networking/src/Syssocket.h
index 36713a2b7b..7d7955426f 100644
--- a/libraries/networking/src/Syssocket.h
+++ b/libraries/networking/src/Syssocket.h
@@ -4,9 +4,6 @@
 #ifdef _WIN32
 #define WINSOCK_API_LINKAGE
 #include <winsock2.h>
-#ifndef _timeval_
-#define _timeval_
-#endif
 typedef SSIZE_T ssize_t;
 typedef ULONG32 in_addr_t; 
 typedef USHORT in_port_t;
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 7be21dfb52..3569c700ed 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -15,10 +15,11 @@
 #include <cctype>
 #include <time.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef _timeval_
 #define _timeval_
 #endif
+#endif
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
@@ -44,7 +45,7 @@ quint64 usecTimestampNow() {
     return (now.tv_sec * 1000000 + now.tv_usec) + ::usecTimestampNowAdjust;
 }
 
-float randFloat () {
+float randFloat() {
     return (rand() % 10000)/10000.f;
 }