diff --git a/core/include/dap_common.h b/core/include/dap_common.h index 5af3beb1df863df76e71b04fd9ea5188ad68f0ac..da9c23c7e4e9b09c61a7d11a73be3707ded203d4 100755 --- a/core/include/dap_common.h +++ b/core/include/dap_common.h @@ -61,10 +61,11 @@ #ifndef __cplusplus # include <stdatomic.h> #else -# include <atomic> -# define _Atomic(X) std::atomic< X > +#include <atomic> +#define _Atomic(X) std::atomic< X > #define atomic_bool _Atomic(bool) #define atomic_uint _Atomic(uint) +#define atomic_int _Atomic(int) #endif #ifdef __MACH__ diff --git a/net/link_manager/CMakeLists.txt b/net/link_manager/CMakeLists.txt index dea1cd3d086193bf2e7080d2ec366d0eabcb7c40..43690c742af8ff7bb8fd54e6a3f700a78b70af76 100644 --- a/net/link_manager/CMakeLists.txt +++ b/net/link_manager/CMakeLists.txt @@ -23,7 +23,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE .) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/uthash/src) if(INSTALL_DAP_SDK) -set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${DAP_CLIENT_HEADERS}") +set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${DAP_LINK_MANAGER_HEADERS}") INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/dap/net/link_manager/ ARCHIVE DESTINATION lib/dap/net/link_manager/