summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Mantellini <angelo.mantellini@cisco.com>2021-05-03 12:43:15 +0200
committerAngelo Mantellini <angelo.mantellini@cisco.com>2021-05-03 13:34:52 +0200
commit9b1c12ef3312e4f7355b2218aaf24773b7d541ff (patch)
treee54b3556637829a7b6eac05e742471722e6a4142
parent07133ac060c2af721941f7b47c52c075df3168ba (diff)
[HICN-703] correct minor cmake issues and memset in manifest_format_fixed.cc
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com> Change-Id: I3ed763941fa58bdfc61b9462d3f3bd268d5a76ed
-rw-r--r--cmake/Modules/BuildMacros.cmake4
-rw-r--r--libtransport/includes/hicn/transport/portability/win_portability.h2
-rw-r--r--libtransport/src/core/manifest_format_fixed.cc4
-rw-r--r--libtransport/src/io_modules/CMakeLists.txt14
4 files changed, 8 insertions, 16 deletions
diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake
index 8914d904d..c57aaa73c 100644
--- a/cmake/Modules/BuildMacros.cmake
+++ b/cmake/Modules/BuildMacros.cmake
@@ -262,10 +262,12 @@ macro (build_module module)
if (${CMAKE_SYSTEM_NAME} MATCHES Darwin)
set(LINK_FLAGS "-Wl,-undefined,dynamic_lookup")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES iOS)
+ set(LINK_FLAGS "-Wl,-undefined,dynamic_lookup")
elseif(${CMAKE_SYSTEM_NAME} MATCHES Linux)
set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-all")
elseif(${CMAKE_SYSTEM_NAME} MATCHES Windows)
- set(LINK_FLAGS "/wd4275")
+ set(LINK_FLAGS "/wd4275")
else()
message(FATAL_ERROR "Trying to build module on a not supportd platform. Aborting.")
endif()
diff --git a/libtransport/includes/hicn/transport/portability/win_portability.h b/libtransport/includes/hicn/transport/portability/win_portability.h
index bfbe431d1..246b734ad 100644
--- a/libtransport/includes/hicn/transport/portability/win_portability.h
+++ b/libtransport/includes/hicn/transport/portability/win_portability.h
@@ -17,7 +17,9 @@
#pragma once
#define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <fcntl.h>
#include <io.h>
#include <parc/windows/parc_Utils.h>
diff --git a/libtransport/src/core/manifest_format_fixed.cc b/libtransport/src/core/manifest_format_fixed.cc
index 55280b460..7076a4c90 100644
--- a/libtransport/src/core/manifest_format_fixed.cc
+++ b/libtransport/src/core/manifest_format_fixed.cc
@@ -34,7 +34,7 @@ FixedManifestEncoder::FixedManifestEncoder(Packet &packet,
current_entry_(0),
signature_size_(signature_size) {
if (clear) {
- *manifest_header_ = {0};
+ memset(manifest_header_, 0, sizeof(*manifest_header_));
}
}
@@ -51,7 +51,7 @@ FixedManifestEncoder &FixedManifestEncoder::clearImpl() {
packet_.trimEnd(sizeof(ManifestHeader) +
manifest_header_->number_of_entries * sizeof(ManifestEntry));
current_entry_ = 0;
- *manifest_header_ = {0};
+ memset(manifest_header_, 0, sizeof(*manifest_header_));
return *this;
}
diff --git a/libtransport/src/io_modules/CMakeLists.txt b/libtransport/src/io_modules/CMakeLists.txt
index b1d251632..cf466721f 100644
--- a/libtransport/src/io_modules/CMakeLists.txt
+++ b/libtransport/src/io_modules/CMakeLists.txt
@@ -13,20 +13,8 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-if (${CMAKE_SYSTEM_NAME} MATCHES Android)
- list(APPEND SOURCE_FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/udp/hicn_forwarder_module.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/udp/udp_socket_connector.cc
- )
+if (${CMAKE_SYSTEM_NAME} MATCHES "^(iOS|Android|Windows)$")
- list(APPEND HEADER_FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/udp/hicn_forwarder_module.h
- ${CMAKE_CURRENT_SOURCE_DIR}/udp/udp_socket_connector.h
- )
-
- set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE)
- set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
-elseif (WIN32)
list(APPEND SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/udp/hicn_forwarder_module.cc
${CMAKE_CURRENT_SOURCE_DIR}/udp/udp_socket_connector.cc