Changeset 14536

Timestamp:

Jun 8, 2015, 7:54:51 PM (6 years ago)

Author:

mikedld

Message:

Bump DHT version used in CMake scripts (includes latest Win32 fixes)

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• libtransmission/tr-dht.c (modified) (1 diff)

trunk/CMakeLists.txt

@@ -125 +125 @@
 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)

trunk/libtransmission/tr-dht.c

@@ -694 +694 @@
     return size;
 }
+
+#if defined (_WIN32) && !defined (__MINGW32__)
+int
+dht_gettimeofday (struct timeval * tv, struct timezone * tz)
+{
+  assert (tz == NULL);
+  return tr_gettimeofday (tv);
+}
+#endif