From: Victor Julien <victor@inliniac.net>
Date: Thu, 21 Feb 2019 19:32:40 +0000 (+0100)
Subject: threads: move sleep macros into common header
X-Git-Tag: suricata-5.0.0-beta1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a9cbb37a0e25b36fda4b4b7ad7a4f9c1cbd07bf;p=thirdparty%2Fsuricata.git

threads: move sleep macros into common header
---

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 10a2967e1b..ffca6b218a 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -70,21 +70,6 @@ __thread uint64_t rwr_lock_cnt;
 #define cpu_set_t cpuset_t
 #endif /* OS_FREEBSD */
 
-#ifdef OS_WIN32
-static inline void SleepUsec(uint64_t usec)
-{
-    uint64_t msec = 1;
-    if (usec > 1000) {
-        msec = usec / 1000;
-    }
-    Sleep(msec);
-}
-#define SleepMsec(msec) Sleep((msec))
-#else
-#define SleepUsec(usec) usleep((usec))
-#define SleepMsec(msec) usleep((msec) * 1000)
-#endif
-
 /* prototypes */
 static int SetCPUAffinity(uint16_t cpu);
 
diff --git a/src/tm-threads.h b/src/tm-threads.h
index 1395db39de..c8b6f47849 100644
--- a/src/tm-threads.h
+++ b/src/tm-threads.h
@@ -29,6 +29,21 @@
 #include "tm-threads-common.h"
 #include "tm-modules.h"
 
+#ifdef OS_WIN32
+static inline void SleepUsec(uint64_t usec)
+{
+    uint64_t msec = 1;
+    if (usec > 1000) {
+        msec = usec / 1000;
+    }
+    Sleep(msec);
+}
+#define SleepMsec(msec) Sleep((msec))
+#else
+#define SleepUsec(usec) usleep((usec))
+#define SleepMsec(msec) usleep((msec) * 1000)
+#endif
+
 #define TM_QUEUE_NAME_MAX 16
 #define TM_THREAD_NAME_MAX 16