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

Merge commit 'a98f18974ae277f669bc2a95178bf0ab2eccc06b' into feature-wisun 

* commit 'a98f18974ae277f669bc2a95178bf0ab2eccc06b':
  Squashed 'features/frameworks/mbed-trace/' changes from 6ced9711c4..b98f6a9050
pull/14164/head
Arto Kinnunen 2021-01-18 14:55:46 +02:00
parent bc16fbec3e a98f18974a
commit 15975a0a7e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features/frameworks/mbed-trace/mbed-trace/mbed_trace.h
View File

@ -69,7 +69,12 @@ extern "C" {
#define MBED_CONF_MBED_TRACE_ENABLE 0 #define MBED_CONF_MBED_TRACE_ENABLE 0
#endif #endif
#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6 #ifndef MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
/* if libservice presence is not configured, enable it by default */
#define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1
#endif
#if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif #endif

2
features/frameworks/mbed-trace/source/mbed_trace.c
View File

@ -21,7 +21,7 @@
#undef MBED_CONF_MBED_TRACE_ENABLE #undef MBED_CONF_MBED_TRACE_ENABLE
#endif #endif
#define MBED_CONF_MBED_TRACE_ENABLE 1 #define MBED_CONF_MBED_TRACE_ENABLE 1
#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6 #if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif #endif