commit 22314f9050851ddebd29bd63085d83f4fa5ba926 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 21 14:09:00 2016 +0200

loony mingwcross bug: insist we dont have clock_gettime. --- src/common/compat_time.c | 1 + src/common/compat_time.h | 3 +++ 2 files changed, 4 insertions(+)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 5891682..011bc9e 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -13,6 +13,7 @@ #include "compat.h"

#ifdef _WIN32 +#undef HAVE_CLOCK_GETTIME #include <winsock2.h> #include <windows.h> #endif diff --git a/src/common/compat_time.h b/src/common/compat_time.h index de6994f..2262446 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -19,6 +19,9 @@ #define TOR_COMPAT_TIME_H

#include "orconfig.h" +#ifdef _WIN32 +#undef HAVE_CLOCK_GETTIME +#endif

#if defined(HAVE_CLOCK_GETTIME) /* to ensure definition of CLOCK_MONOTONIC_COARSE if it's there */