Re-apply original einclude.am and test.h changes. Remove ESP32 WOLFSSH_OLD_THREADING

Author: gojimmypi

ide/Espressif/ESP-IDF/examples/wolfssh_echoserver/CMakeLists.txt

@@ -38,9 +38,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DESP_ENABLE_WOLFSSH")
 # Managed wolfSSL Components prior to 5.7.4 need a manual setting for WOLFSSL_WOLFSSH
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_WOLFSSH")
 
-# TODO: The ESP32 echo server example still uses older threading
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSH_OLD_THREADING")
-
 # Optional:
 # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSH_TERM")
 # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEBUG_WOLFSSH")

ide/include.am

@@ -2,10 +2,11 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-include ide/winvs/include.am
 include ide/CSBENCH/include.am
-include ide/MQX/include.am
+include ide/Espressif/include.am
 include ide/IAR-EWARM/include.am
+include ide/MQX/include.am
 include ide/STM32CUBE/include.am
+include ide/winvs/include.am
 
-EXTRA_DIST += ide/Renesas
+EXTRA_DIST += ide/Renesas

wolfssh/test.h

@@ -949,7 +949,8 @@ static INLINE void WaitTcpReady(tcp_ready* ready)
 #ifdef WOLFSSH_TEST_THREADING
 
 
-#if !defined(WOLFSSH_OLD_THREADING) && !defined(WOLFSSH_OLDER_THREADING)
+#if !defined(WOLFSSH_OLD_THREADING) && !defined(WOLFSSH_OLDER_THREADING) && \
+    !defined(SINGLE_THREADED)
 
 static INLINE void ThreadStart(THREAD_CB fun, void* args, THREAD_TYPE* thread)
 {