summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-06 18:33:37 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-06 18:33:37 +0300
commit284a220a99bdecee94f0dc5a49a5600c033370dc (patch)
tree13d35c66e140ae34f3bbd8c48933628bafc99684 /extra
parent95ab6b85e4e04e309b9b430f23e660a21fbf1ba8 (diff)
parentbb177df080a14709d3fbce3cb1d6cc5274f7ae31 (diff)
downloadmariadb-git-284a220a99bdecee94f0dc5a49a5600c033370dc.tar.gz
Auto-merge from mysql-trunk-merge.
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