From ed339b1c2b4f92784d92bf9cbba289573efe54bf Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Sun, 22 Dec 2019 11:17:22 -0600
Subject: [PATCH] Add sleep and usleep macros so all sleeps use nanosleep

---
 icom/optoscan.c      |  1 -
 include/hamlib/rig.h | 14 ++++++++++++++
 src/usb_port.c       |  7 +++----
 winradio/winradio.c  |  1 -
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/icom/optoscan.c b/icom/optoscan.c
index af1db8b92..c24da430c 100644
--- a/icom/optoscan.c
+++ b/icom/optoscan.c
@@ -27,7 +27,6 @@
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
 #include <math.h>
-#include <sys/time.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index dc8d675fa..995d15c10 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -92,6 +92,20 @@
 #define CONSTANT_64BIT_FLAG(BIT) (1ull << (BIT))
 #endif
 
+#include <time.h>
+#undef sleep
+#undef usleep
+#if 1
+#define usleep(n) \
+  do { \
+    struct timespec t;\
+    t.tv_sec=0;\
+    t.tv_nsec = n*1000ul;\
+    nanosleep(&t,NULL);\
+  } while(0) 
+#define sleep(n) do { struct timespec t;t.tv_sec=0;t.tv_nsec = n*1000000000ul;nanosleep(&t,NULL);} while(0)
+#endif
+
 __BEGIN_DECLS
 
 extern HAMLIB_EXPORT_VAR(const char) hamlib_version[];
diff --git a/src/usb_port.c b/src/usb_port.c
index 55ec409cd..4d2fac222 100644
--- a/src/usb_port.c
+++ b/src/usb_port.c
@@ -35,8 +35,6 @@
 #  include "config.h"
 #endif
 
-#include <hamlib/rig.h>
-
 /*
  * Compile only if libusb is available
  */
@@ -46,10 +44,11 @@
 #include <stdlib.h>
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
-#include <unistd.h>  /* UNIX standard function definitions */
+#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
+
+#include <hamlib/rig.h>
 
 #ifdef HAVE_LIBUSB_H
 #  include <libusb.h>
diff --git a/winradio/winradio.c b/winradio/winradio.c
index 6bc1248eb..5822f9071 100644
--- a/winradio/winradio.c
+++ b/winradio/winradio.c
@@ -24,7 +24,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <unistd.h>  /* UNIX standard function definitions */
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif