From db389d4b4b3cf6cf080926399bef2584ab896ba1 Mon Sep 17 00:00:00 2001 From: Arto Kinnunen Date: Fri, 21 Feb 2020 10:54:42 +0200 Subject: [PATCH] Squashed 'features/frameworks/nanostack-libservice/' changes from 9af756886f..9a61e73787 9a61e73787 Merge pull request #89 from ARMmbed/update_from_mbedos 2a07f443ed Fixed typo: 'lenght' in ip6string.h 050aa7f31a Include ns_types.h before mbed_trace.h in Nanomesh git-subtree-dir: features/frameworks/nanostack-libservice git-subtree-split: 9a61e737872ba60fa73e9375011f63e9e266577a --- mbed-client-libservice/ip6string.h | 2 +- mbed-client-libservice/ns_trace.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mbed-client-libservice/ip6string.h b/mbed-client-libservice/ip6string.h index 0f3cec5613..34ee097b34 100644 --- a/mbed-client-libservice/ip6string.h +++ b/mbed-client-libservice/ip6string.h @@ -57,7 +57,7 @@ uint_fast8_t ip6_prefix_tos(const void *prefix, uint_fast8_t prefix_len, char *p * IPv4 tunneling addresses are not covered. * * \param ip6addr IPv6 address in string format. - * \param len Lenght of ipv6 string, maximum of 41. + * \param len Length of ipv6 string, maximum of 41. * \param dest buffer for address. MUST be 16 bytes. Filled with 0 on error. * \return boolean set to true if conversion succeed, false if it didn't */ diff --git a/mbed-client-libservice/ns_trace.h b/mbed-client-libservice/ns_trace.h index 206e239982..2219f8b808 100644 --- a/mbed-client-libservice/ns_trace.h +++ b/mbed-client-libservice/ns_trace.h @@ -28,6 +28,7 @@ #define FEA_TRACE_SUPPORT #endif +#include "ns_types.h" #include "mbed-trace/mbed_trace.h" #endif /* NS_TRACE_H_ */