From 57d98e48f701d11430b40fb83bfc96409f7d9247 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 5 Dec 2017 21:24:28 +0100 Subject: [PATCH] Added detection of Keil ARM Compiler (issue #629) --- CHANGELOG.md | 1 + src/ArduinoJson/Configuration.hpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e04351..24a0e4f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,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) +* Added detection of Keil ARM 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 23f96090..8370569c 100644 --- a/src/ArduinoJson/Configuration.hpp +++ b/src/ArduinoJson/Configuration.hpp @@ -6,7 +6,8 @@ // Small or big machine? #ifndef ARDUINOJSON_EMBEDDED_MODE -#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) +#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) || \ + defined(__ARMCC_VERSION) #define ARDUINOJSON_EMBEDDED_MODE 1 #else #define ARDUINOJSON_EMBEDDED_MODE 0