From 7aa90a3812d9418036c56005ddf9007759ab2271 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Wed, 30 Mar 2011 23:50:25 +0000 Subject: [PATCH] (trunk libT) #4153 "Protect against non-monotonic time in libutp" -- another attempt at getting it to compile on win32 --- third-party/libutp/utp_utils.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/third-party/libutp/utp_utils.cpp b/third-party/libutp/utp_utils.cpp index f9a9b0dc3..edc01b875 100644 --- a/third-party/libutp/utp_utils.cpp +++ b/third-party/libutp/utp_utils.cpp @@ -148,7 +148,7 @@ static uint64_t GetMicroseconds() } #endif //!__APPLE__ -#endif //!WIN32 +uint32 UTP_GetMilliseconds(); uint64 UTP_GetMicroseconds() { @@ -164,6 +164,8 @@ uint64 UTP_GetMicroseconds() return now; } +#endif //!WIN32 + uint32 UTP_GetMilliseconds() { return UTP_GetMicroseconds() / 1000;