From 66650a95d8f9c372945873e1a3b8946078f34bdc Mon Sep 17 00:00:00 2001
From: gojimmypi <jim@wolfssl.com>
Date: Wed, 16 Jul 2025 12:04:05 -0700
Subject: [PATCH] Improve WOLFSSL_USER_IO defaults

---
 IDE/WIN/user_settings.h     | 9 ++++++++-
 wolfssl/wolfcrypt/wc_port.h | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index a1011abf8..82ae8c15d 100644
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -6,7 +6,14 @@
 #error This user_settings.h header is only designed for Windows
 #endif
 
-#define USE_WOLFSSL_IO
+/* Optionally use custom IO, uncomment this line: */
+/* #define WOLFSSL_USER_IO */
+#ifdef WOLFSSL_USER_IO
+    #define WOLFSSL_NO_SOCK
+#else
+    #define USE_WOLFSSL_IO
+#endif
+
 #define HAVE_AESGCM
 #define WOLFSSL_TLS13
 #define HAVE_HKDF
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index c0fd47f62..7db79a0f8 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -1132,6 +1132,9 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
         #endif
     #endif
     #ifndef SOCKET_INVALID
+        #ifndef INVALID_SOCKET
+            #define INVALID_SOCKET ((SOCKET_T)(-1))
+        #endif
         #define SOCKET_INVALID INVALID_SOCKET
     #endif
 #else