From 8abd26624b54ba7379a0b4de8479a1bff04df011 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.blaudden>
Date: Wed, 28 Mar 2007 18:47:51 +0200
Subject: Import yaSSL

extra/yassl/include/lock.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl.hpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/algorithm.hpp:
  Import patch yassl.diff
---
 extra/yassl/include/lock.hpp             | 2 +-
 extra/yassl/include/openssl/ssl.h        | 1 +
 extra/yassl/include/socket_wrapper.hpp   | 5 +++--
 extra/yassl/include/yassl.hpp            | 2 +-
 extra/yassl/src/ssl.cpp                  | 1 -
 extra/yassl/taocrypt/mySTL/algorithm.hpp | 2 --
 6 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'extra')

diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp
index b961ec3e478..0525943e45d 100644
--- a/extra/yassl/include/lock.hpp
+++ b/extra/yassl/include/lock.hpp
@@ -28,7 +28,7 @@ namespace yaSSL {
 
 
 #ifdef MULTI_THREADED
-   #if defined(_WIN32) || defined(_WIN64)
+    #ifdef _WIN32
         #include <windows.h>
 
         class Mutex {
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
index c7cd103841c..7dd33e3fcad 100644
--- a/extra/yassl/include/openssl/ssl.h
+++ b/extra/yassl/include/openssl/ssl.h
@@ -189,6 +189,7 @@ enum {  /* ERR Constants */
     ERR_TXT_STRING = 1,
     EVP_R_BAD_DECRYPT = 2
 };
+
 /*
   Allow type used by SSL_set_fd to be changed, default to int
   in order to be compatible with OpenSSL
diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp
index ba52dbab3ec..308704c2af0 100644
--- a/extra/yassl/include/socket_wrapper.hpp
+++ b/extra/yassl/include/socket_wrapper.hpp
@@ -28,8 +28,9 @@
 
 #include <assert.h>
 
-#include "openssl/ssl.h"                        /* for socket_t */
-#if !defined(_WIN32) && !defined(_WIN64)
+#ifdef _WIN32
+    #include <winsock2.h>
+#else 
     #include <sys/time.h>
     #include <sys/types.h>
     #include <sys/socket.h>
diff --git a/extra/yassl/include/yassl.hpp b/extra/yassl/include/yassl.hpp
index b8190c484f7..29e0a5d94ec 100644
--- a/extra/yassl/include/yassl.hpp
+++ b/extra/yassl/include/yassl.hpp
@@ -28,7 +28,7 @@
 namespace yaSSL {
 
 
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
     typedef unsigned int SOCKET_T;
 #else
     typedef int          SOCKET_T;
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
index cbd84efcdba..86dfa1c6ebd 100644
--- a/extra/yassl/src/ssl.cpp
+++ b/extra/yassl/src/ssl.cpp
@@ -39,7 +39,6 @@
 #include "coding.hpp"           // HexDecoder
 #include "helpers.hpp"          // for placement new hack
 #include <stdio.h>
-#include <assert.h>
 
 #ifdef _WIN32
     #include <windows.h>    // FindFirstFile etc..
diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp
index f6a29cf4bdb..d8bc29a0bb9 100644
--- a/extra/yassl/taocrypt/mySTL/algorithm.hpp
+++ b/extra/yassl/taocrypt/mySTL/algorithm.hpp
@@ -27,8 +27,6 @@
 
 namespace mySTL {
 
-#undef max
-#undef min
 
 template<typename T>
 inline const T& max(const T& a, const T&b)
-- 
cgit v1.2.1