Skip to content

Commit

Permalink
Include Arduino.h before stdlib.h to avoid conflict (closes #1693)
Browse files Browse the repository at this point in the history
  • Loading branch information
bblanchon committed Dec 26, 2021
1 parent 4f73c18 commit 55d4c36
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/ArduinoJson.hpp
Expand Up @@ -14,6 +14,13 @@
# endif
#endif

// Include Arduino.h before stdlib.h to avoid conflict with atexit()
// https://github.com/bblanchon/ArduinoJson/pull/1693#issuecomment-1001060240
#if ARDUINOJSON_ENABLE_ARDUINO_STRING || ARDUINOJSON_ENABLE_ARDUINO_STREAM || \
ARDUINOJSON_ENABLE_ARDUINO_PRINT || ARDUINOJSON_ENABLE_PROGMEM
# include <Arduino.h>
#endif

#include "ArduinoJson/Array/ArrayRef.hpp"
#include "ArduinoJson/Object/ObjectRef.hpp"
#include "ArduinoJson/Variant/VariantRef.hpp"
Expand Down

0 comments on commit 55d4c36

Please sign in to comment.