Peer review feedback. Thank you @jmalak

CMakeLists.txt

@@ -2491,9 +2491,7 @@ if(WOLFSSL_EXAMPLES)
         add_executable(tls_bench
             ${CMAKE_CURRENT_SOURCE_DIR}/examples/benchmark/tls_bench.c)
         target_link_libraries(tls_bench wolfssl)
-        if(NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
         target_link_libraries(tls_bench Threads::Threads)
-        endif()
         set_property(TARGET tls_bench
                  PROPERTY RUNTIME_OUTPUT_DIRECTORY
                  ${WOLFSSL_OUTPUT_BASE}/examples/benchmark)
@@ -2515,9 +2513,7 @@ if(WOLFSSL_EXAMPLES)
         ${CMAKE_CURRENT_BINARY_DIR})
     target_compile_options(unit_test PUBLIC "-DNO_MAIN_DRIVER")
     target_link_libraries(unit_test wolfssl)
-    if(NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
     target_link_libraries(unit_test Threads::Threads)
-    endif()
     set_property(TARGET unit_test
                  PROPERTY RUNTIME_OUTPUT_DIRECTORY
                  ${WOLFSSL_OUTPUT_BASE}/tests/)
@@ -2778,11 +2774,11 @@ if(WOLFSSL_INSTALL)
         else()
             set(LIBM)
         endif()
+    endif()
 
     configure_file(support/wolfssl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc @ONLY)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    endif()
 
     include(CMakePackageConfigHelpers)
     configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in

src/ssl_load.c

@@ -35,7 +35,7 @@
 #ifdef WOLFSSL_SYS_CA_CERTS
 
 #ifdef _WIN32
-    #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+    #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
     #include <windows.h>
     #include <wincrypt.h>
 

wolfcrypt/benchmark/benchmark.c

@@ -14463,7 +14463,7 @@ void bench_sphincsKeySign(byte level, byte optim)
 #if defined(_WIN32) && !defined(INTIME_RTOS)
 
     #define WIN32_LEAN_AND_MEAN
-    #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+    #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
     #include <windows.h>
 
     double current_time(int reset)

wolfcrypt/src/random.c

@@ -87,7 +87,7 @@ This library contains implementation for the random number generator.
     #ifndef _WIN32_WINNT
         #define _WIN32_WINNT 0x0400
     #endif
-    #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+    #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
     #include <windows.h>
     #include <wincrypt.h>
 #elif defined(HAVE_WNR)

wolfssl/internal.h

@@ -154,7 +154,7 @@
 #ifdef __WATCOMC__
     #if defined(__OS2__)
     #elif defined(__NT__)
-        #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+        #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
         #include <windows.h>
     #elif defined(__LINUX__)
         #ifndef SINGLE_THREADED
@@ -166,7 +166,7 @@
     #ifdef WOLFSSL_GAME_BUILD
         #include "system/xtl.h"
     #else
-        #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+        #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
         #include <windows.h>
     #endif
 #elif defined(THREADX)

wolfssl/test.h

@@ -2132,7 +2132,7 @@ static WC_INLINE unsigned int my_psk_client_cs_cb(WOLFSSL* ssl,
 #elif defined(USE_WINDOWS_API)
 
     #define WIN32_LEAN_AND_MEAN
-    #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+    #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
     #include <windows.h>
 
     static WC_INLINE double current_time(int reset)

wolfssl/wolfcrypt/wc_port.h

@@ -123,7 +123,7 @@
 #if defined(__WATCOMC__)
     #if !defined(SINGLE_THREADED)
         #if defined(USE_WINDOWS_API)
-            #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+            #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
             #include <windows.h>
             #include <process.h>
         #elif defined(__OS2__)
@@ -141,7 +141,7 @@
         #endif
     #else
         #if defined(USE_WINDOWS_API)
-            #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+            #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
             #include <windows.h>
         #elif defined(__OS2__)
             #include <os2.h>
@@ -160,7 +160,7 @@
             #define WIN32_LEAN_AND_MEAN
         #endif
         #if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
-            #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+            #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
             #include <windows.h>
             #ifndef WOLFSSL_USER_IO
                 #include <ws2tcpip.h> /* required for InetPton */
@@ -1205,7 +1205,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
     #define XGMTIME(c, t)   gmtime((c))
 
 #elif defined(_WIN32_WCE)
-    #define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */
+    #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
     #include <windows.h>
     #include <stdlib.h> /* For file system */