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 -#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 #include -#ifdef WIN32 +#ifdef _WIN32 #ifndef _timeval_ #define _timeval_ #endif +#endif #ifdef __APPLE__ #include @@ -44,7 +45,7 @@ quint64 usecTimestampNow() { return (now.tv_sec * 1000000 + now.tv_usec) + ::usecTimestampNowAdjust; } -float randFloat () { +float randFloat() { return (rand() % 10000)/10000.f; }