Merge commit 'd53d1dffb7405776dd84fa24a2eec7c18f445fed'

* commit 'd53d1dffb7405776dd84fa24a2eec7c18f445fed':
  Squashed 'features/frameworks/nanostack-libservice/' changes from 1d4c358..dd98c37

Author: Arto Kinnunen

features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h

@@ -122,7 +122,7 @@ typedef int_fast32_t int_fast24_t;
 #define __alignas_is_defined 1
 #elif (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) || (defined __cplusplus && __cplusplus >= 201103L)
 # if defined __ARMCC_VERSION && __ARMCC_VERSION < 6120000
-    /* Workaround for Arm Compiler versions prior to 6.12 */
+/* Workaround for Arm Compiler versions prior to 6.12 */
 #   if !defined __cplusplus
 #     define alignas _Alignas
 #   endif

features/frameworks/nanostack-libservice/source/libBits/common_functions.c

@@ -35,7 +35,7 @@ bool bitsequal(const uint8_t *a, const uint8_t *b, uint_fast8_t bits)
     uint_fast8_t bytes = bits / 8;
     bits %= 8;
 
-    if (memcmp(a, b, bytes)) {
+    if (bytes && memcmp(a, b, bytes)) {
         return false;
     }
 

features/frameworks/nanostack-libservice/test/libService/unittest/stubs/mbed_trace_stub.c

@@ -18,13 +18,13 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#ifndef YOTTA_CFG_MBED_TRACE
-#define YOTTA_CFG_MBED_TRACE 1
-#define YOTTA_CFG_MBED_TRACE_FEA_IPV6 1
+#ifndef MBED_CONF_MBED_TRACE_ENABLE
+#define MBED_CONF_MBED_TRACE_ENABLE 1
+#define MBED_CONF_MBED_TRACE_FEA_IPV6 1
 #endif
 
 #include "mbed-trace/mbed_trace.h"
-#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
+#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
 #include "mbed-client-libservice/ip6string.h"
 #include "mbed-client-libservice/common_functions.h"
 #endif
@@ -101,7 +101,7 @@ const char *mbed_trace_last(void)
 }
 
 /* Helping functions */
-#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
+#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
 char *mbed_trace_ipv6(const void *addr_ptr)
 {
     return NULL;
@@ -111,7 +111,7 @@ char *mbed_trace_ipv6_prefix(const uint8_t *prefix, uint8_t prefix_len)
 {
     return NULL;
 }
-#endif //YOTTA_CFG_MBED_TRACE_FEA_IPV6
+#endif //MBED_CONF_MBED_TRACE_FEA_IPV6
 
 char *mbed_trace_array(const uint8_t *buf, uint16_t len)
 {