mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
This commit is contained in:
unknown 2005-05-20 19:39:03 +05:00
commit 6888f098fc
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
#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

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

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

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

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

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

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

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

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

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

@ -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 {

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

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

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

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

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

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

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

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

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

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

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

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