Merge remote-tracking branch 'upstream/development' into mueller/timeman-update

2020-12-22 14:27:36 +01:00
parent 8349e12e43 0e1eac4f14
commit 1ad94bae7d
14 changed files with 170 additions and 42 deletions
--- a/timemanager/Clock.h
+++ b/timemanager/Clock.h
@ -7,7 +7,12 @@
 #include "../globalfunctions/timevalOperations.h"

 #include <cstdint>
+
+#ifdef WIN32
+#include <winsock2.h>
+#else
 #include <sys/time.h>
+#endif

 class Clock {
 public: