ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd53d1dffb7405776dd84fa24a2eec7c18f445fed' 

* commit 'd53d1dffb7405776dd84fa24a2eec7c18f445fed':
  Squashed 'features/frameworks/nanostack-libservice/' changes from 1d4c358..dd98c37
pull/9838/head
Arto Kinnunen 2019-02-25 13:00:32 +02:00
parent 220470c577 d53d1dffb7
commit 3b1ccfac0a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h
View File

@ -122,7 +122,7 @@ typedef int_fast32_t int_fast24_t;
#define __alignas_is_defined 1 #define __alignas_is_defined 1
#elif (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) || (defined __cplusplus && __cplusplus >= 201103L) #elif (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) || (defined __cplusplus && __cplusplus >= 201103L)
# if defined __ARMCC_VERSION && __ARMCC_VERSION < 6120000 # 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 # if !defined __cplusplus
# define alignas _Alignas # define alignas _Alignas
# endif # endif

2
features/frameworks/nanostack-libservice/source/libBits/common_functions.c
View File

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

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

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