From a98f18974ae277f669bc2a95178bf0ab2eccc06b Mon Sep 17 00:00:00 2001 From: Arto Kinnunen Date: Mon, 18 Jan 2021 14:55:46 +0200 Subject: [PATCH] Squashed 'features/frameworks/mbed-trace/' changes from 6ced9711c4..b98f6a9050 b98f6a9050 Merge remote-tracking branch 'origin/master' into release_for_mbed_os 7a60a77390 Enable libservice by default fc7503c1a6 Make IPv6 tracing conditional to nanostack-libservce git-subtree-dir: features/frameworks/mbed-trace git-subtree-split: b98f6a9050afd1d0b9354bc82d5d363fff5a1405 --- mbed-trace/mbed_trace.h | 7 ++++++- source/mbed_trace.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mbed-trace/mbed_trace.h b/mbed-trace/mbed_trace.h index c0cef6a888..02196e39cc 100644 --- a/mbed-trace/mbed_trace.h +++ b/mbed-trace/mbed_trace.h @@ -69,7 +69,12 @@ extern "C" { #define MBED_CONF_MBED_TRACE_ENABLE 0 #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 #endif diff --git a/source/mbed_trace.c b/source/mbed_trace.c index f90e0ea5d9..eba23ef2c7 100644 --- a/source/mbed_trace.c +++ b/source/mbed_trace.c @@ -21,7 +21,7 @@ #undef MBED_CONF_MBED_TRACE_ENABLE #endif #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 #endif