Merge branch 'feature/redefine_nopoll_file_folder_structure' into 'master'

feat(nopoll): Redefine nopoll file folder structure See merge request sdk/ESP8266_RTOS_SDK!80
2025-07-15 08:32:42 +08:00 · 2018-04-21 21:35:55 +08:00
parent 65db6cb900 e82247bf35
commit 1644dba60f
28 changed files with 4 additions and 4 deletions
--- a/components/nopoll/component.mk
+++ b/components/nopoll/component.mk
@ -3,7 +3,7 @@
 #

 ifdef CONFIG_SSL_USING_MBEDTLS
-COMPONENT_ADD_INCLUDEDIRS += include/nopoll
+COMPONENT_ADD_INCLUDEDIRS += nopoll/src port/include

-COMPONENT_SRCDIRS := library
+COMPONENT_SRCDIRS := nopoll/src
 endif
--- a/components/nopoll/nopoll/src/nopoll-regression-client.c
+++ b/components/nopoll/nopoll/src/nopoll-regression-client.c
@ -36,7 +36,7 @@
 *      Email address:
 *         info@aspl.es - http://www.aspl.es/nopoll
 */
-#include <nopoll/nopoll.h>
+#include <nopoll.h>
 #include "esp_common.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
--- a/components/nopoll/nopoll/src/nopoll.c
+++ b/components/nopoll/nopoll/src/nopoll.c
--- a/components/nopoll/include/nopoll/nopoll.h
+++ b/components/nopoll/include/nopoll/nopoll.h
--- a/components/nopoll/nopoll/src/nopoll_conn.c
+++ b/components/nopoll/nopoll/src/nopoll_conn.c
--- a/components/nopoll/include/nopoll/nopoll_conn.h
+++ b/components/nopoll/include/nopoll/nopoll_conn.h
--- a/components/nopoll/nopoll/src/nopoll_conn_opts.c
+++ b/components/nopoll/nopoll/src/nopoll_conn_opts.c
--- a/components/nopoll/include/nopoll/nopoll_conn_opts.h
+++ b/components/nopoll/include/nopoll/nopoll_conn_opts.h
--- a/components/nopoll/nopoll/src/nopoll_ctx.c
+++ b/components/nopoll/nopoll/src/nopoll_ctx.c
--- a/components/nopoll/include/nopoll/nopoll_ctx.h
+++ b/components/nopoll/include/nopoll/nopoll_ctx.h
--- a/components/nopoll/nopoll/src/nopoll_decl.c
+++ b/components/nopoll/nopoll/src/nopoll_decl.c
--- a/components/nopoll/include/nopoll/nopoll_decl.h
+++ b/components/nopoll/include/nopoll/nopoll_decl.h
--- a/components/nopoll/include/nopoll/nopoll_handlers.h
+++ b/components/nopoll/include/nopoll/nopoll_handlers.h
--- a/components/nopoll/nopoll/src/nopoll_io.c
+++ b/components/nopoll/nopoll/src/nopoll_io.c
--- a/components/nopoll/include/nopoll/nopoll_io.h
+++ b/components/nopoll/include/nopoll/nopoll_io.h
--- a/components/nopoll/nopoll/src/nopoll_listener.c
+++ b/components/nopoll/nopoll/src/nopoll_listener.c
--- a/components/nopoll/include/nopoll/nopoll_listener.h
+++ b/components/nopoll/include/nopoll/nopoll_listener.h
--- a/components/nopoll/nopoll/src/nopoll_log.c
+++ b/components/nopoll/nopoll/src/nopoll_log.c
--- a/components/nopoll/include/nopoll/nopoll_log.h
+++ b/components/nopoll/include/nopoll/nopoll_log.h
--- a/components/nopoll/nopoll/src/nopoll_loop.c
+++ b/components/nopoll/nopoll/src/nopoll_loop.c
--- a/components/nopoll/include/nopoll/nopoll_loop.h
+++ b/components/nopoll/include/nopoll/nopoll_loop.h
--- a/components/nopoll/nopoll/src/nopoll_msg.c
+++ b/components/nopoll/nopoll/src/nopoll_msg.c
--- a/components/nopoll/include/nopoll/nopoll_msg.h
+++ b/components/nopoll/include/nopoll/nopoll_msg.h
--- a/components/nopoll/include/nopoll/nopoll_private.h
+++ b/components/nopoll/include/nopoll/nopoll_private.h
--- a/components/nopoll/nopoll/src/nopoll_win32.c
+++ b/components/nopoll/nopoll/src/nopoll_win32.c
--- a/components/nopoll/include/nopoll/nopoll_win32.h
+++ b/components/nopoll/include/nopoll/nopoll_win32.h
--- a/components/nopoll/include/nopoll/nopoll_config.h
+++ b/components/nopoll/include/nopoll/nopoll_config.h
--- a/examples/protocols/websocket/main/websocket.c
+++ b/examples/protocols/websocket/main/websocket.c
@ -36,7 +36,7 @@
 *      Email address:
 *         info@aspl.es - http://www.aspl.es/nopoll
 */
-#include <nopoll/nopoll.h>
+#include <nopoll.h>
 #include "esp_common.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"