diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-11-03 18:07:19 +0100 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-11-03 18:07:19 +0100 |
| commit | 7b7f01499a6c5569f58484326a8a4cbb976096ae (patch) | |
| tree | 7212ef78f7170b2332cf8e13603284aa120e2539 | |
| parent | cafe3c7fcaf32a5141b8bf4fbe4299eedabfb2b0 (diff) | |
| parent | 6ff8f716c3cfae2e9e54ff71a06b16da89d94b03 (diff) | |
| download | mariadb-git-7b7f01499a6c5569f58484326a8a4cbb976096ae.tar.gz | |
Merge bug#47867 to 5.1-bugteam
| -rw-r--r-- | extra/yassl/taocrypt/src/random.cpp | 1 | ||||
| -rwxr-xr-x | mysql-test/lib/My/SafeProcess/safe_process_win.cc | 3 |
2 files changed, 0 insertions, 4 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 diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 455262b29f5..aa9093fb2b4 100755 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -50,9 +50,6 @@ is killed. */ -/* Requires Windows 2000 or higher */ -#define _WIN32_WINNT 0x0500 - #include <windows.h> #include <stdio.h> #include <tlhelp32.h> |