8000 Added detection of Keil ARM Compiler (issue #629) · java64/ArduinoJson@57d98e4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 57d98e4

Browse files
bblanchonbblanchon
committed
Added detection of Keil ARM Compiler (issue bblanchon#629)
1 parent cf2babc commit 57d98e4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ HEAD
77
* Added `JsonVariant::operator|` to return a default value (see bellow)
88
* Added a clear error message when compiled as C instead of C++ (issue #629)
99
* Added detection of MPLAB XC compiler (issue #629)
10+
* Added detection of Keil ARM Compiler (issue #629)
1011
* Rewrote example `JsonHttpClient.ino` (issue #600)
1112

1213
> ### How to use the new feature?

‎src/ArduinoJson/Configuration.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
// Small or big machine?
88
#ifndef ARDUINOJSON_EMBEDDED_MODE
9-
#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC)
9+
#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) || \
10+
defined(__ARMCC_VERSION)
1011
#define ARDUINOJSON_EMBEDDED_MODE 1
1112
#else
1213
#define ARDUINOJSON_EMBEDDED_MODE 0

0 commit comments

Comments
 (0)
0