Commit 94cb1c1c authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
parents 34ada6e4 339ae7c7

extra/yassl/include/lock.hpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace yaSSL { 




#ifdef MULTI_THREADED

   #if defined(_WIN32) || defined(_WIN64)

    #ifdef _WIN32

        #include <windows.h>



        class Mutex {

extra/yassl/include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -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

extra/yassl/include/socket_wrapper.hpp

+3 −2
Original line number Diff line number Diff line
@@ -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>

extra/yassl/include/yassl.hpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
namespace yaSSL {





#if defined(_WIN32) || defined(_WIN64)

#ifdef _WIN32

    typedef unsigned int SOCKET_T;

#else

    typedef int          SOCKET_T;

extra/yassl/src/ssl.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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..