summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-11-30 14:34:39 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-11-30 14:34:39 +0200
commita6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3 (patch)
treec5510a774ac5e8722c26070e21e3d266d6408381 /extra
parent71a1b1e755074fa816369a7967ed9bd2758e9f55 (diff)
parentc5a30828067468d08007bdb36903e411652c8e4b (diff)
downloadmariadb-git-a6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3.tar.gz
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/src/random.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/random.cpp b/extra/yassl/taocrypt/src/random.cpp
index 89fd5f7c7bc..2bbc0a85e8b 100644
--- a/extra/yassl/taocrypt/src/random.cpp
+++ b/extra/yassl/taocrypt/src/random.cpp
@@ -27,7 +27,6 @@
#include <time.h>
#if defined(_WIN32)
- #define _WIN32_WINNT 0x0400
#include <windows.h>
#include <wincrypt.h>
#else