From 488bd66eb3977bb79d4e5891071a67437180dfc0 Mon Sep 17 00:00:00 2001 From: ryanjsims <31775294+ryanjsims@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:49:25 -0700 Subject: [PATCH] Fix conflicting C++ linkage for pico_lwip panic() (#1167) --- src/rp2_common/pico_lwip/include/arch/cc.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rp2_common/pico_lwip/include/arch/cc.h b/src/rp2_common/pico_lwip/include/arch/cc.h index 8194dcb..a494adc 100644 --- a/src/rp2_common/pico_lwip/include/arch/cc.h +++ b/src/rp2_common/pico_lwip/include/arch/cc.h @@ -70,7 +70,13 @@ typedef int sys_prot_t; #endif #ifndef LWIP_PLATFORM_ASSERT +#ifdef __cplusplus +extern "C" { +#endif void panic(const char *fmt, ...); +#ifdef __cplusplus +} +#endif #define LWIP_PLATFORM_ASSERT(x) panic(x) #endif