diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-03-31 11:10:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-03-31 11:10:00 +0000 |
| commit | 23c3bb7400839b664096ad5e16a2346386109bda (patch) | |
| tree | d1999acef9f91cd25db9b7c63fd2963cd7ba0e57 /utils | |
| parent | d46e59824bd3fc67abe7bd725965aa454942d640 (diff) | |
| parent | 3718e549ee31ac764b327bbf3d6e51dd7e224b46 (diff) | |
Merge "[HICN-581] update hicn stack to support windows, again"
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/src/ping_server.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3e99fbae2..d82425236 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -35,7 +35,7 @@ set(HICN_UTILS hicn-utils CACHE INTERNAL "" FORCE) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package(Libtransport REQUIRED) else() - if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") + if (DISABLE_SHARED_LIBRARIES) set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_STATIC}) set(DEPENDENCIES ${LIBTRANSPORT_STATIC}) else () diff --git a/utils/src/ping_server.cc b/utils/src/ping_server.cc index de02a2072..b1a6e1509 100644 --- a/utils/src/ping_server.cc +++ b/utils/src/ping_server.cc @@ -16,6 +16,7 @@ #include <hicn/transport/interfaces/socket_producer.h> #ifndef _WIN32 #include <hicn/transport/utils/daemonizator.h> +#include <unistd.h> #else #include <openssl/applink.c> #endif @@ -26,7 +27,7 @@ #include <hicn/transport/security/signer.h> #include <hicn/transport/utils/string_tokenizer.h> -#include <unistd.h> + #include <asio.hpp> namespace transport { |