Auto-merge from mysql-trunk-merge.

284a220a · Alexander Nozdrin · 95ab6b85 · bb177df0 · 284a220a · 284a220a
Commit 284a220a authored Nov 06, 2009 by Alexander Nozdrin
Showing with 0 additions and 4 deletions

extra/yassl/taocrypt/src/random.cpp extra/yassl/taocrypt/src/random.cpp +0 -1

mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc +0 -3

No files found.
--- 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>