Commit c9724dde authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden

Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my51-yassl_import2

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents 80f35d63 04c4cdde
......@@ -28,7 +28,7 @@ namespace yaSSL {
#ifdef MULTI_THREADED
#if defined(_WIN32) || defined(_WIN64)
#ifdef _WIN32
#include <windows.h>
class Mutex {
......
......@@ -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
......
......@@ -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>
......
......@@ -28,7 +28,7 @@
namespace yaSSL {
#if defined(_WIN32) || defined(_WIN64)
#ifdef _WIN32
typedef unsigned int SOCKET_T;
#else
typedef int SOCKET_T;
......
......@@ -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..
......
......@@ -27,8 +27,6 @@
namespace mySTL {
#undef max
#undef min
template<typename T>
inline const T& max(const T& a, const T&b)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment