alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 04:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/rename_http_server' into 'master'

Browse Source 
Rename http_server component to esp_http_server

See merge request idf/esp-idf!3553
This commit is contained in:
Angus Gratton
2018-10-26 12:59:38 +08:00
parent 76fcee55a6 e2b1ae259d
commit cdb10ec5ad
30 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp32/esp_err_to_name.c
View File

@@ -13,6 +13,9 @@
#if __has_include("esp_http_client.h")
#include "esp_http_client.h"
#endif
#if __has_include("esp_http_server.h")
#include "esp_http_server.h"
#endif
#if __has_include("esp_image_format.h")
#include "esp_image_format.h"
#endif
@@ -37,9 +40,6 @@
#if __has_include("esp_wps.h")
#include "esp_wps.h"
#endif
#if __has_include("http_server.h")
#include "http_server.h"
#endif
#if __has_include("nvs.h")
#include "nvs.h"
#endif
@@ -456,7 +456,7 @@ static const esp_err_msg_t esp_err_msg_table[] = {
# ifdef ESP_ERR_HTTP_EAGAIN
ERR_TBL_IT(ESP_ERR_HTTP_EAGAIN), /* 28679 0x7007 Mapping of errno EAGAIN to esp_err_t */
# endif
// components/http_server/include/http_server.h
// components/esp_http_server/include/esp_http_server.h
# ifdef ESP_ERR_HTTPD_BASE
ERR_TBL_IT(ESP_ERR_HTTPD_BASE), /* 32768 0x8000 Starting number of HTTPD error codes */
# endif