From bab790ab87a0de8f4d2ea2e6274cca58ac372b63 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Mon, 9 Sep 2013 13:48:28 -0700
Subject: [PATCH] add port.c to visual studio builds

---
 configure.ac                | 2 +-
 ctaocrypt/ctaocrypt.vcproj  | 4 ++++
 cyassl-ntru.vcproj          | 4 ++++
 cyassl.vcproj               | 4 ++++
 cyassl/ctaocrypt/include.am | 1 +
 cyassl/ctaocrypt/port.h     | 3 +++
 cyassl/ctaocrypt/settings.h | 7 +++++++
 cyassl/version.h            | 4 ++--
 8 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 28acba649..04b9db2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.8.0],[http://www.yassl.com])
+AC_INIT([cyassl],[2.8.1],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/ctaocrypt/ctaocrypt.vcproj b/ctaocrypt/ctaocrypt.vcproj
index 8c73f3e23..fd6856498 100755
--- a/ctaocrypt/ctaocrypt.vcproj
+++ b/ctaocrypt/ctaocrypt.vcproj
@@ -296,6 +296,10 @@
 				RelativePath=".\src\md5.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\rabbit.c"
 				>
diff --git a/cyassl-ntru.vcproj b/cyassl-ntru.vcproj
index d337af687..57720a52d 100755
--- a/cyassl-ntru.vcproj
+++ b/cyassl-ntru.vcproj
@@ -230,6 +230,10 @@
 				RelativePath=".\ctaocrypt\src\misc.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\pwdbased.c"
 				>
diff --git a/cyassl.vcproj b/cyassl.vcproj
index b843262bc..958f3ab61 100755
--- a/cyassl.vcproj
+++ b/cyassl.vcproj
@@ -222,6 +222,10 @@
 				RelativePath=".\ctaocrypt\src\memory.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\pwdbased.c"
 				>
diff --git a/cyassl/ctaocrypt/include.am b/cyassl/ctaocrypt/include.am
index b83a9e035..8be43c5e1 100644
--- a/cyassl/ctaocrypt/include.am
+++ b/cyassl/ctaocrypt/include.am
@@ -21,6 +21,7 @@ nobase_include_HEADERS+= \
                          cyassl/ctaocrypt/md4.h \
                          cyassl/ctaocrypt/md5.h \
                          cyassl/ctaocrypt/misc.h \
+                         cyassl/ctaocrypt/port.h \
                          cyassl/ctaocrypt/pwdbased.h \
                          cyassl/ctaocrypt/rabbit.h \
                          cyassl/ctaocrypt/random.h \
diff --git a/cyassl/ctaocrypt/port.h b/cyassl/ctaocrypt/port.h
index 37ac4fccf..28ec413b6 100644
--- a/cyassl/ctaocrypt/port.h
+++ b/cyassl/ctaocrypt/port.h
@@ -33,6 +33,9 @@
     #ifdef CYASSL_GAME_BUILD
         #include "system/xtl.h"
     #else
+        #ifndef WIN32_LEAN_AND_MEAN
+            #define WIN32_LEAN_AND_MEAN
+        #endif
         #if defined(_WIN32_WCE) || defined(WIN32_LEAN_AND_MEAN)
             /* On WinCE winsock2.h must be included before windows.h */
             #include <winsock2.h>
diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h
index 79cb668e8..a3c532e2f 100644
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@@ -150,6 +150,13 @@
 #endif
 
 
+/* Micrium will use Visual Studio for compilation but not the Win32 API */
+#if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) \
+        && !defined(EBSNET)
+    #define USE_WINDOWS_API
+#endif
+
+
 #if defined(CYASSL_LEANPSK) && !defined(XMALLOC_USER)
     #include <stdlib.h>
     #define XMALLOC(s, h, type)  malloc((s))
diff --git a/cyassl/version.h b/cyassl/version.h
index 9ced7e67c..a17c62890 100644
--- a/cyassl/version.h
+++ b/cyassl/version.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "2.8.0"
-#define LIBCYASSL_VERSION_HEX 0x02008000
+#define LIBCYASSL_VERSION_STRING "2.8.1"
+#define LIBCYASSL_VERSION_HEX 0x02008001
 
 #ifdef __cplusplus
 }