Commit 56cf3c88 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0

parents 39c7b098 7936630e
Loading
Loading
Loading
Loading
+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
+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 {
+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>
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
#ifndef mySTL_HELPERS_HPP
#define mySTL_HELPERS_HPP

#include <cstdlib>
#include <stdlib.h>


namespace mySTL {
+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 {
Loading