From cf2babc598baa148473618b1e1c2bedbc7cebea3 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 5 Dec 2017 21:18:21 +0100 Subject: [PATCH] Added detection of MPLAB XC compiler (issue #629) --- CHANGELOG.md | 1 + src/ArduinoJson/Configuration.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da2af206..a4e04351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ HEAD * Added `JsonVariant::operator|` to return a default value (see bellow) * Added a clear error message when compiled as C instead of C++ (issue #629) +* Added detection of MPLAB XC compiler (issue #629) * Rewrote example `JsonHttpClient.ino` (issue #600) > ### How to use the new feature? diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp index 69bddcc3..23f96090 100644 --- a/src/ArduinoJson/Configuration.hpp +++ b/src/ArduinoJson/Configuration.hpp @@ -6,7 +6,7 @@ // Small or big machine? #ifndef ARDUINOJSON_EMBEDDED_MODE -#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) +#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) #define ARDUINOJSON_EMBEDDED_MODE 1 #else #define ARDUINOJSON_EMBEDDED_MODE 0