From 088c5c6ab9a6ad1d360cb2a4235ff6ba1c9bec81 Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Mon, 8 Jun 2015 19:54:51 +0000 Subject: [PATCH] Bump DHT version used in CMake scripts (includes latest Win32 fixes) --- CMakeLists.txt | 2 +- libtransmission/tr-dht.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c78844a..3df3617a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ set(LIBAPPINDICATOR_MINIMUM 0.4.90) tr_github_upstream(EVENT2 libevent/libevent c51b159cff 7be95856a39714dfd2218cb56415c990) tr_github_upstream(NATPMP miniupnp/libnatpmp cf7f452d66 f1e7d5bf580972738d8ef21743d0adf7) tr_github_upstream(MINIUPNPC miniupnp/miniupnp 5de2bcb561 bdc5b64b9b8401d3524c50b9ec8173c1) -tr_github_upstream(DHT jech/dht bf62643a95 0a2a2abe447d8a73f0084c1bc837e566) +tr_github_upstream(DHT jech/dht cc379e406d 958253fafa01c59950d357c148aff090) tr_github_upstream(UTP bittorrent/libutp 7c4f19abdf 8b92aa05abec5f6675cdde6477cd6f51) tr_github_upstream(B64 mikedld/libb64 c1e3323498 10128cb30ad768d2c4caf627e0f69db3) diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c index 305de71d9..243429f64 100644 --- a/libtransmission/tr-dht.c +++ b/libtransmission/tr-dht.c @@ -693,3 +693,12 @@ dht_random_bytes (void * buf, size_t size) tr_rand_buffer (buf, size); return size; } + +#if defined (_WIN32) && !defined (__MINGW32__) +int +dht_gettimeofday (struct timeval * tv, struct timezone * tz) +{ + assert (tz == NULL); + return tr_gettimeofday (tv); +} +#endif