Avoid use of global mutable state in mono_time on win32.

This uses a trick to get read-write access to `this` from a `const`
member function, similar to C++ `mutable`, but uglier.

2 files changed, 6 insertions, 4 deletions

diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 232b7d95..f9c09dd5 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -600,9 +600,10 @@ static void ip_callback(void *data, int32_t number, IP_Port ip_port)
 
 #define NUM_DHT_FRIENDS 20
 
-static uint64_t get_clock_callback(void *user_data)
+static uint64_t get_clock_callback(Mono_Time *mono_time, void *user_data)
 {
-    return *(uint64_t *)user_data;
+    const uint64_t *clock = (const uint64_t *)user_data;
+    return *clock;
 }
 
 static void test_DHT_test(void)
diff --git a/auto_tests/run_auto_test.h b/auto_tests/run_auto_test.h
index 602ad524..bcbfed55 100644
--- a/auto_tests/run_auto_test.h
+++ b/auto_tests/run_auto_test.h
@@ -42,9 +42,10 @@ static void iterate_all_wait(uint32_t tox_count, Tox **toxes, State *state, uint
     c_sleep(20);
 }
 
-static uint64_t get_state_clock_callback(void *user_data)
+static uint64_t get_state_clock_callback(Mono_Time *mono_time, void *user_data)
 {
-    return ((State *)user_data)->clock;
+    const State *state = (const State *)user_data;
+    return state->clock;
 }
 
 static void run_auto_test(uint32_t tox_count, void test(Tox **toxes, State *state))