mirror of
https://github.com/esphome/esphome.git
synced 2026-09-15 00:58:40 +00:00
Merge branch 'fix-rp2040-crash-handler-section-attr' into integration
This commit is contained in:
@@ -8,17 +8,11 @@
|
||||
#include "mdns_component.h"
|
||||
|
||||
// Arduino-Pico's PolledTimeout.h (pulled in by ESP8266mDNS.h) redefines IRAM_ATTR to empty.
|
||||
// Save the current definition (from hal.h), undef before include to avoid a redefinition warning,
|
||||
// then restore the original value afterwards.
|
||||
#ifdef IRAM_ATTR
|
||||
#define ESPHOME_SAVED_IRAM_ATTR IRAM_ATTR
|
||||
// Save and restore our definition around the include to avoid a redefinition warning.
|
||||
#pragma push_macro("IRAM_ATTR")
|
||||
#undef IRAM_ATTR
|
||||
#endif
|
||||
#include <ESP8266mDNS.h>
|
||||
#ifdef ESPHOME_SAVED_IRAM_ATTR
|
||||
#define IRAM_ATTR ESPHOME_SAVED_IRAM_ATTR
|
||||
#undef ESPHOME_SAVED_IRAM_ATTR
|
||||
#endif
|
||||
#pragma pop_macro("IRAM_ATTR")
|
||||
|
||||
namespace esphome::mdns {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user