From 8d0c7b1faeed1e3df6e6f90658559f373bbf63fb Mon Sep 17 00:00:00 2001
From: Toni <matzeton@googlemail.com>
Date: Wed, 18 Aug 2021 12:34:16 +0300
Subject: Fixed Mingw64 build, SonerCloud-CI and more. (#1273)

* Added ARM build and unit test run for SonarCloud-CI.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

* Fixed Mingw64 build.

 * adapted to SonarCloud-CI workflow
 * removed broken and incomplete Windows example (tested on VS2017/VS2019)
 * removed unnecessary include (e.g. pthread.h for the library which does not make use of it)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 src/include/ndpi_includes.h |  5 -----
 src/include/ndpi_unix.h     |  3 ---
 src/include/ndpi_win32.h    | 19 ++-----------------
 3 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'src/include')

diff --git a/src/include/ndpi_includes.h b/src/include/ndpi_includes.h
index 197f32fce..3b87dda65 100644
--- a/src/include/ndpi_includes.h
+++ b/src/include/ndpi_includes.h
@@ -38,7 +38,6 @@
 #else
 #include <sys/types.h>
 #include <sys/param.h>
-#include <pthread.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
 #include <sys/socket.h>
@@ -57,10 +56,6 @@
 #if defined __NetBSD__ || defined __OpenBSD__
 #include <netinet/in_systm.h>
 
-#if defined __OpenBSD__
-#include <pthread.h>
-
-#endif
 #endif
 #endif
 #endif
diff --git a/src/include/ndpi_unix.h b/src/include/ndpi_unix.h
index 6e6987bfd..f4901761e 100644
--- a/src/include/ndpi_unix.h
+++ b/src/include/ndpi_unix.h
@@ -28,9 +28,6 @@
 #include <netinet/in.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <netinet/in_systm.h>
-#if defined(__OpenBSD__)
-#include <pthread.h>
-#endif
 #endif
 #endif
 
diff --git a/src/include/ndpi_win32.h b/src/include/ndpi_win32.h
index b79a880e8..03f1389df 100644
--- a/src/include/ndpi_win32.h
+++ b/src/include/ndpi_win32.h
@@ -76,25 +76,10 @@ typedef uint           u_int32_t;
 typedef uint           u_int;
 typedef unsigned       __int64 u_int64_t;
 
-#define pthread_t                HANDLE
-#define pthread_mutex_t          HANDLE
-#define pthread_rwlock_t         pthread_mutex_t
-#define pthread_rwlock_init      pthread_mutex_init
-#define pthread_rwlock_wrlock    pthread_mutex_lock
-#define pthread_rwlock_rdlock    pthread_mutex_lock
-#define pthread_rwlock_unlock    pthread_mutex_unlock
-#define pthread_rwlock_destroy	 pthread_mutex_destroy
+#define gmtime_r(a, b)                  memcpy(b, gmtime(a), sizeof(struct tm))
 
-#define gmtime_r(a, b)           memcpy(b, gmtime(a), sizeof(struct tm))
-
-#define in_addr_t				unsigned long
-
-extern unsigned long waitForNextEvent(unsigned long ulDelay /* ms */);
-
-#define sleep(a /* sec */)              waitForNextEvent(1000*a /* ms */)
-#define strtok_r                        strtok_s
 #define timegm                          _mkgmtime
 
-extern struct tm* localtime_r(const time_t* timep, struct tm* r);
+#define sleep(a /* sec */)              Sleep(1000*a /* ms */)
 
 #endif /* __NDPI_WIN32_H__ */
-- 
cgit v1.2.3