Assume PROGMEM is available as soon as ARDUINO is defined (#1693)

extras/tests/Helpers/Arduino.h

@@ -7,5 +7,6 @@
 #include "api/Print.h"
 #include "api/Stream.h"
 #include "api/String.h"
+#include "progmem_emulation.hpp"
 
 #define ARDUINO_H_INCLUDED 1

extras/tests/Helpers/progmem_emulation.hpp

@@ -3,7 +3,6 @@
 // MIT License
 
 #include <stdint.h>  // uint8_t
-#include <string.h>  // strcmp, strlen...
 
 #define PROGMEM
 

extras/tests/Misc/StringAdapters.cpp

@@ -6,7 +6,6 @@
 #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
 
 #include "custom_string.hpp"
-#include "progmem_emulation.hpp"
 #include "weird_strcmp.hpp"
 
 #include <ArduinoJson/Strings/StringAdapters.hpp>

extras/tests/Misc/weird_strcmp.hpp

@@ -1,5 +1,11 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
 #include <ArduinoJson/Namespace.hpp>
 
+#include <string.h>  // strcmp, strncmp
+
 // Issue #1198: strcmp() implementation that returns a value larger than 8-bit
 
 namespace ARDUINOJSON_NAMESPACE {

extras/tests/MixedConfiguration/enable_progmem_1.cpp

@@ -2,8 +2,6 @@
 // Copyright Benoit Blanchon 2014-2021
 // MIT License
 
-#include "progmem_emulation.hpp"
-
 #define ARDUINOJSON_ENABLE_PROGMEM 1
 #include <ArduinoJson.h>
 

extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp

@@ -2,8 +2,6 @@
 // Copyright Benoit Blanchon 2014-2021
 // MIT License
 
-#include "progmem_emulation.hpp"
-
 #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
 #define ARDUINOJSON_ENABLE_PROGMEM 1
 #define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 0

extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp

@@ -2,8 +2,6 @@
 // Copyright Benoit Blanchon 2014-2021
 // MIT License
 
-#include "progmem_emulation.hpp"
-
 #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
 #define ARDUINOJSON_ENABLE_PROGMEM 1
 #define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1