Commit 3b2ba12e authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-build 

into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build


extra/yassl/mySTL/helpers.hpp:
  Auto merged
parents 27b7f85a 6888f098

extra/yassl/include/buffer.hpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#ifndef yaSSL_BUFFER_HPP

#define yaSSL_BUFFER_HPP



#include <cassert>              // assert

#include <assert.h>             // assert

#include "yassl_error.hpp"      // Error

#include "memory.hpp"           // mySTL::auto_ptr

#include "algorithm.hpp"        // mySTL::swap

extra/yassl/include/log.hpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "socket_wrapper.hpp"



#ifdef YASSL_LOG

#include <cstdio>

#include <stdio.h>

#endif



namespace yaSSL {

extra/yassl/include/socket_wrapper.hpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#ifndef yaSSL_SOCKET_WRAPPER_HPP

#define yaSSL_SOCKET_WRAPPER_HPP



#include <cassert>

#include <assert.h>



#ifdef WIN32

    #include <winsock2.h>

extra/yassl/mySTL/stdexcept.hpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#define mySTL_STDEXCEPT_HPP





#include <cstring>  // strncpy

#include <string.h>  // strncpy





namespace mySTL {

extra/yassl/mySTL/vector.hpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "helpers.hpp"    // construct, destory, fill, etc.

#include "algorithm.hpp"  // swap

#include <new>            // ::operator new and delete, placement too

#include <cassert>        // assert

#include <assert.h>       // assert





namespace mySTL {