Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update

2020-12-22 15:30:03 +01:00
parent ab9965cb81 1ad94bae7d
commit 5a4f453aaa
46 changed files with 791 additions and 587 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: