summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-21 14:09:00 +0200
committerNick Mathewson <nickm@torproject.org>2016-07-21 14:09:00 +0200
commit22314f9050851ddebd29bd63085d83f4fa5ba926 (patch)
tree70aeb915b2f32529e5008f7b8a11135fbdb15e5c /src/common
parent852cff043b6f6561beb8021f3e8a05a327482d9a (diff)
downloadtor-22314f9050851ddebd29bd63085d83f4fa5ba926.tar.gz
tor-22314f9050851ddebd29bd63085d83f4fa5ba926.zip
loony mingwcross bug: insist we dont have clock_gettime.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compat_time.c1
-rw-r--r--src/common/compat_time.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 58916825cb..011bc9e2a4 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 de6994fafb..2262446e57 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 */