sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-07 12:23:47 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix_watchdog_reset_idf_web_server' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-03 14:32:11 -05:00
parent 5252a03102 0938abbcae
commit 85025ff3f7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/web_server_idf/web_server_idf.cpp
View File

@@ -4,8 +4,6 @@
#include <memory> #include <memory>
#include <cstring> #include <cstring>
#include <cctype> #include <cctype>
#include <sys/socket.h>
#include <errno.h>
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
@@ -27,6 +25,10 @@
#include "esphome/components/web_server/list_entities.h" #include "esphome/components/web_server/list_entities.h"
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
// Include socket headers after Arduino headers to avoid IPADDR_NONE/INADDR_NONE macro conflicts
#include <sys/socket.h>
#include <errno.h>
namespace esphome { namespace esphome {
namespace web_server_idf { namespace web_server_idf {