1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.1
This commit is contained in:
unknown 2005-05-20 19:36:19 +05:00
commit a1e3d7ef83
12 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/include/buffer.hpp
View File

@ -27,7 +27,7 @@
#ifndef yaSSL_BUFFER_HPP #ifndef yaSSL_BUFFER_HPP
#define yaSSL_BUFFER_HPP #define yaSSL_BUFFER_HPP
#include <cassert> // assert #include <assert.h> // assert
#include "yassl_error.hpp" // Error #include "yassl_error.hpp" // Error
#include "memory.hpp" // mySTL::auto_ptr #include "memory.hpp" // mySTL::auto_ptr
#include "algorithm.hpp" // mySTL::swap #include "algorithm.hpp" // mySTL::swap

2
extra/yassl/include/log.hpp
View File

@ -30,7 +30,7 @@
#include "socket_wrapper.hpp" #include "socket_wrapper.hpp"
#ifdef YASSL_LOG #ifdef YASSL_LOG
#include <cstdio> #include <stdio.h>
#endif #endif
namespace yaSSL { namespace yaSSL {

2
extra/yassl/include/socket_wrapper.hpp
View File

@ -29,7 +29,7 @@
#ifndef yaSSL_SOCKET_WRAPPER_HPP #ifndef yaSSL_SOCKET_WRAPPER_HPP
#define yaSSL_SOCKET_WRAPPER_HPP #define yaSSL_SOCKET_WRAPPER_HPP
#include <cassert> #include <assert.h>
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
extra/yassl/mySTL/helpers.hpp
View File

@ -27,7 +27,7 @@
#ifndef mySTL_HELPERS_HPP #ifndef mySTL_HELPERS_HPP
#define mySTL_HELPERS_HPP #define mySTL_HELPERS_HPP
#include <cstdlib> #include <stdlib.h>
namespace mySTL { namespace mySTL {

2
extra/yassl/mySTL/stdexcept.hpp
View File

@ -28,7 +28,7 @@
#define mySTL_STDEXCEPT_HPP #define mySTL_STDEXCEPT_HPP
#include <cstring> // strncpy #include <string.h> // strncpy
namespace mySTL { namespace mySTL {

2
extra/yassl/mySTL/vector.hpp
View File

@ -31,7 +31,7 @@
#include "helpers.hpp" // construct, destory, fill, etc. #include "helpers.hpp" // construct, destory, fill, etc.
#include "algorithm.hpp" // swap #include "algorithm.hpp" // swap
#include <new> // ::operator new and delete, placement too #include <new> // ::operator new and delete, placement too
#include <cassert> // assert #include <assert.h> // assert
namespace mySTL { namespace mySTL {

2
extra/yassl/src/ssl.cpp
View File

@ -36,7 +36,7 @@
#include "openssl/ssl.h" #include "openssl/ssl.h"
#include "handshake.hpp" #include "handshake.hpp"
#include "yassl_int.hpp" #include "yassl_int.hpp"
#include <cstdio> #include <stdio.h>
namespace yaSSL { namespace yaSSL {

6
extra/yassl/taocrypt/include/block.hpp
View File

@ -31,7 +31,7 @@
#include "stdexcept.hpp" // mySTL::runtime_error #include "stdexcept.hpp" // mySTL::runtime_error
#include "misc.hpp" #include "misc.hpp"
#include <string.h> // memcpy #include <string.h> // memcpy
#include <cstddef> // ptrdiff_t #include <stddef.h> // ptrdiff_t
#if defined(_MSC_VER) && defined(_CRTAPI1) #if defined(_MSC_VER) && defined(_CRTAPI1)
@ -49,11 +49,7 @@ class AllocatorBase
public: public:
typedef T value_type; typedef T value_type;
typedef size_t size_type; typedef size_t size_type;
#ifdef TAOCRYPT_MSVCRT6
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
#else
typedef std::ptrdiff_t difference_type;
#endif
typedef T* pointer; typedef T* pointer;
typedef const T* const_pointer; typedef const T* const_pointer;
typedef T& reference; typedef T& reference;

2
extra/yassl/taocrypt/include/file.hpp
View File

@ -29,7 +29,7 @@
#include "misc.hpp" #include "misc.hpp"
#include "block.hpp" #include "block.hpp"
#include "error.hpp" #include "error.hpp"
#include <cstdio> #include <stdio.h>
namespace TaoCrypt { namespace TaoCrypt {

2
extra/yassl/taocrypt/include/integer.hpp
View File

@ -29,7 +29,7 @@
#include "block.hpp" #include "block.hpp"
#include "random.hpp" #include "random.hpp"
#include "file.hpp" #include "file.hpp"
#include <cstring> #include <string.h>
#include "algorithm.hpp" // mySTL::swap #include "algorithm.hpp" // mySTL::swap

2
extra/yassl/taocrypt/include/runtime.hpp
View File

@ -31,7 +31,7 @@
#if __GNUC__ > 2 #if __GNUC__ > 2
#include <cstdlib> #include <stdlib.h>
static void* operator new (size_t sz) static void* operator new (size_t sz)

2
extra/yassl/taocrypt/src/dh.cpp
View File

@ -26,7 +26,7 @@
#include "runtime.hpp" #include "runtime.hpp"
#include "dh.hpp" #include "dh.hpp"
#include "asn.hpp" #include "asn.hpp"
#include <cmath> #include <math.h>
namespace TaoCrypt { namespace TaoCrypt {