diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:33:37 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:33:37 +0300 |
commit | ae71ffc1c88f2e37320dee98824e6d437a083604 (patch) | |
tree | 13d35c66e140ae34f3bbd8c48933628bafc99684 /extra | |
parent | e6d79c2bc99e302a31fc0bbc885e8c6407092eba (diff) | |
parent | 7b7f01499a6c5569f58484326a8a4cbb976096ae (diff) | |
download | mariadb-git-ae71ffc1c88f2e37320dee98824e6d437a083604.tar.gz |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'extra')
-rw-r--r-- | extra/yassl/taocrypt/src/random.cpp | 1 |
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 |