Auto-merge from mysql-trunk-merge.

2009-11-06 18:33:37 +03:00 · 2009-11-06 18:33:37 +03:00 · f56223598e
commit f56223598e
parent db6334d49e 273f9b633c
2 changed files with 0 additions and 4 deletions
--- 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
--- 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>