Squashed 'features/frameworks/nanostack-libservice/' changes from 9af756886f..9a61e73787

Arto Kinnunen · Arto Kinnunen · commit a97eb91030e7 · 2020-02-20T16:25:14.000+02:00
9a61e73787 Merge pull request ARMmbed#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
diff --git 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
@@ -28,6 +28,7 @@
 #define FEA_TRACE_SUPPORT
 #endif
 
+#include "ns_types.h"
 #include "mbed-trace/mbed_trace.h"
 
 #endif /* NS_TRACE_H_ */

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ uint_fast8_t ip6_prefix_tos(const void prefix, uint_fast8_t prefix_len, char p`
`57`	`57`	`* IPv4 tunneling addresses are not covered.`
`58`	`58`	`*`
`59`	`59`	`* \param ip6addr IPv6 address in string format.`
`60`		`- * \param len Lenght of ipv6 string, maximum of 41.`
	`60`	`+ * \param len Length of ipv6 string, maximum of 41.`
`61`	`61`	`* \param dest buffer for address. MUST be 16 bytes. Filled with 0 on error.`
`62`	`62`	`* \return boolean set to true if conversion succeed, false if it didn't`
`63`	`63`	`*/`