mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
788b0339d4
* gnu/packages/patches/opendht-nanosleep.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/networking.scm (opendht) [source]: Apply it. Change-Id: I14589dba3a99ae51bb522ffdbe2a1390c74aa75a
61 lines
1.4 KiB
Diff
61 lines
1.4 KiB
Diff
Upstream-status: merged with commit ccec6c2f6770484278b25c3335d4bd8882bc4c87
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b54d5b49..584b0179 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -83,6 +83,7 @@ case "${host_os}" in
|
|
;;
|
|
linux*)
|
|
SYS=linux
|
|
+ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200809L"
|
|
;;
|
|
darwin*)
|
|
SYS=darwin
|
|
diff --git a/src/compat/msvc/unistd.h b/src/compat/msvc/unistd.h
|
|
index d43d4796..abcc1c61 100644
|
|
--- a/src/compat/msvc/unistd.h
|
|
+++ b/src/compat/msvc/unistd.h
|
|
@@ -50,4 +50,6 @@
|
|
typedef int mode_t;
|
|
#include <BaseTsd.h>
|
|
|
|
+#define nanosleep(x) Sleep((x) / 1000000)
|
|
+
|
|
#endif
|
|
diff --git a/tools/dhtcnode.c b/tools/dhtcnode.c
|
|
index cdb04714..f78a7f7f 100644
|
|
--- a/tools/dhtcnode.c
|
|
+++ b/tools/dhtcnode.c
|
|
@@ -24,12 +24,17 @@
|
|
#include <stdlib.h>
|
|
#include <stdatomic.h>
|
|
#include <inttypes.h>
|
|
+#include <time.h>
|
|
|
|
#include <getopt.h>
|
|
#include <readline/readline.h>
|
|
#include <readline/history.h>
|
|
#include <arpa/inet.h>
|
|
|
|
+#ifdef _WIN32
|
|
+#include <windows.h>
|
|
+#endif
|
|
+
|
|
struct op_context {
|
|
dht_runner* runner;
|
|
atomic_bool stop;
|
|
@@ -287,7 +292,12 @@ int main(int argc, char **argv)
|
|
|
|
// Wait until shutdown callback is called
|
|
while (!atomic_load(&ctx.stop)) {
|
|
- usleep(10000);
|
|
+#ifdef _WIN32
|
|
+ Sleep(10); // 10ms
|
|
+#else
|
|
+ struct timespec ts = {0, 10000000}; // 10ms
|
|
+ nanosleep(&ts, NULL);
|
|
+#endif
|
|
}
|
|
dht_runner_delete(runner);
|
|
return EXIT_SUCCESS;
|