From 3a685057376d5cfb6f532362a860112551390ca6 Mon Sep 17 00:00:00 2001 From: Mike Matera Date: Thu, 12 Jan 2017 08:54:01 -0800 Subject: [PATCH] Added a guard to prevent some C++ infrastructure compilation on Arduino because it might be defined already. --- src/abi/abi.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/abi/abi.cpp b/src/abi/abi.cpp index 386f35a9..ecc20482 100644 --- a/src/abi/abi.cpp +++ b/src/abi/abi.cpp @@ -28,6 +28,11 @@ extern "C" { +#if defined(ARDUINO) + /* Arduino defines some of these. + * There can be link issues if they're redefined + */ +#else /* This function is called in the event that a non-overidden * pure virtual function is called. The compiler should never * let that happen. We get to choose what to do - we will abort @@ -36,4 +41,5 @@ extern "C" { abort(); } +#endif }