From a08ab1fc7a4e15853df2b41f7b0b827b70979da3 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfsssl.com>
Date: Sat, 16 Nov 2019 07:30:20 +0900
Subject: [PATCH] fix mnGW error

---
 IDE/WIN/user_settings.h        |  1 +
 examples/benchmark/tls_bench.c | 26 +++++++++++++-------------
 wolfssl/wolfcrypt/types.h      |  4 +++-
 3 files changed, 17 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 examples/benchmark/tls_bench.c
 mode change 100644 => 100755 wolfssl/wolfcrypt/types.h

diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index f2071520f..6625488a7 100755
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -25,6 +25,7 @@
 #else
     /* Enables blinding mode, to prevent timing attacks */
     #define WC_RSA_BLINDING
+#define NO_MULTIBYTE_PRINT
 
     #if defined(WOLFSSL_LIB)
         /* The lib */
diff --git a/examples/benchmark/tls_bench.c b/examples/benchmark/tls_bench.c
old mode 100644
new mode 100755
index 6f446e0f2..3b612a456
--- a/examples/benchmark/tls_bench.c
+++ b/examples/benchmark/tls_bench.c
@@ -447,18 +447,18 @@ static int SocketRecv(int sockFd, char* buf, int sz)
     int recvd = (int)recv(sockFd, buf, sz, 0);
     if (recvd == -1) {
         switch (errno) {
-    #if EAGAIN != EWOULDBLOCK
+    #if EAGAIN != SOCKET_EWOULDBLOCK
         case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
     #endif
-        case EWOULDBLOCK:
+        case SOCKET_EWOULDBLOCK:
             return WOLFSSL_CBIO_ERR_WANT_READ;
-        case ECONNRESET:
+        case SOCKET_ECONNRESET:
             return WOLFSSL_CBIO_ERR_CONN_RST;
-        case EINTR:
+        case SOCKET_EINTR:
             return WOLFSSL_CBIO_ERR_ISR;
-        case ECONNREFUSED: /* DTLS case */
+        case SOCKET_ECONNREFUSED: /* DTLS case */
             return WOLFSSL_CBIO_ERR_WANT_READ;
-        case ECONNABORTED:
+        case SOCKET_ECONNABORTED:
             return WOLFSSL_CBIO_ERR_CONN_CLOSE;
         default:
             return WOLFSSL_CBIO_ERR_GENERAL;
@@ -475,16 +475,16 @@ static int SocketSend(int sockFd, char* buf, int sz)
     int sent = (int)send(sockFd, buf, sz, 0);
     if (sent == -1) {
         switch (errno) {
-    #if EAGAIN != EWOULDBLOCK
+    #if EAGAIN != SOCKET_EWOULDBLOCK
         case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
     #endif
-        case EWOULDBLOCK:
+        case SOCKET_EWOULDBLOCK:
             return WOLFSSL_CBIO_ERR_WANT_READ;
-        case ECONNRESET:
+        case SOCKET_ECONNRESET:
             return WOLFSSL_CBIO_ERR_CONN_RST;
-        case EINTR:
+        case SOCKET_EINTR:
             return WOLFSSL_CBIO_ERR_ISR;
-        case EPIPE:
+        case SOCKET_EPIPE:
             return WOLFSSL_CBIO_ERR_CONN_CLOSE;
         default:
             return WOLFSSL_CBIO_ERR_GENERAL;
@@ -873,7 +873,7 @@ static void* client_thread(void* args)
 static int SetupSocketAndListen(int* listenFd, word32 port)
 {
     struct sockaddr_in servAddr;
-    int optval = 1;
+    const char optval = 1;
 
     /* Setup server address */
     XMEMSET(&servAddr, 0, sizeof(servAddr));
@@ -923,7 +923,7 @@ static int SocketWaitClient(info_t* info)
     socklen_t size = sizeof(clientAddr);
 
     if ((connd = accept(info->listenFd, (struct sockaddr*)&clientAddr, &size)) == -1) {
-        if (errno == EWOULDBLOCK)
+        if (errno == SOCKET_EWOULDBLOCK)
             return -2;
         printf("ERROR: failed to accept the connection\n");
         return -1;
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
old mode 100644
new mode 100755
index 299b4c628..99c615233
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -500,7 +500,9 @@
                     }
                     #define XSNPRINTF xsnprintf
                 #endif /* (_MSC_VER >= 1900) */
-            #endif /* _MSC_VER || __CYGWIN__ || __MINGW32__ */
+            #else
+                #define XSNPRINTF snprintf
+            #endif /* _MSC_VER */
         #endif /* USE_WINDOWS_API */
 
         #if defined(WOLFSSL_CERT_EXT) || defined(OPENSSL_EXTRA) \