Merge branch 'followup/hal-esp32' into followup/hal-esp8266

esphome/components/esp32/hal.cpp

@@ -1,7 +1,9 @@
 #ifdef USE_ESP32
 
-#include "crash_handler.h"
+// defines.h must come before crash_handler.h so USE_ESP32_CRASH_HANDLER is set
+// before crash_handler.h's #ifdef-guarded namespace block is parsed.
 #include "esphome/core/defines.h"
+#include "crash_handler.h"
 #include "esphome/core/hal.h"
 
 #include <esp_clk_tree.h>

esphome/core/hal/hal_esp8266.h

@@ -22,6 +22,7 @@ extern "C" unsigned long millis(void);
 // NOLINTEND(google-runtime-int,readability-identifier-naming,readability-redundant-declaration)
 
 // Forward decl from <user_interface.h> for arch_feed_wdt() inline below.
+// NOLINTNEXTLINE(readability-redundant-declaration)
 extern "C" void system_soft_wdt_feed(void);
 
 namespace esphome {