Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus

2022-02-01 11:00:57 +01:00
parent d39e0c8bb6 02ac92a6b3
commit 751de7accc
11 changed files with 53 additions and 241 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -7,12 +7,3 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
 )

 add_subdirectory(fsfw)
-
-# Configure File
-
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
--- a/src/fsfw/globalfunctions/timevalOperations.h
+++ b/src/fsfw/globalfunctions/timevalOperations.h
@ -2,8 +2,9 @@
 #define TIMEVALOPERATIONS_H_

 #include <stdint.h>
+#include <fsfw/platform.h>

-#ifdef WIN32
+#ifdef PLATFORM_WIN
 #include <winsock2.h>
 #else
 #include <sys/time.h>