feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Added detection of Keil ARM Compiler (issue #629)

Browse Source
This commit is contained in:
Benoit Blanchon
2017-12-05 21:24:28 +01:00
parent cf2babc598
commit 57d98e48f7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ HEAD
* Added `JsonVariant::operator|` to return a default value (see bellow) * 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 a clear error message when compiled as C instead of C++ (issue #629)
* Added detection of MPLAB XC compiler (issue #629) * Added detection of MPLAB XC compiler (issue #629)
* Added detection of Keil ARM Compiler (issue #629)
* Rewrote example `JsonHttpClient.ino` (issue #600) * Rewrote example `JsonHttpClient.ino` (issue #600)
> ### How to use the new feature? > ### How to use the new feature?

3
src/ArduinoJson/Configuration.hpp
View File

@ -6,7 +6,8 @@
// Small or big machine? // Small or big machine?
#ifndef ARDUINOJSON_EMBEDDED_MODE #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 #define ARDUINOJSON_EMBEDDED_MODE 1
#else #else
#define ARDUINOJSON_EMBEDDED_MODE 0 #define ARDUINOJSON_EMBEDDED_MODE 0