bk commit into 6.0 tree (vvaintroub:1.2633)

[vvaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub.  When vvaintroub does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-09 13:19:54+02:00, vvaintroub@wva. +2 -0
  Cset exclude: vvaintroub@wva.|ChangeSet|20080503112120|49985

  include/config-win.h@stripped, 2008-05-09 13:19:51+02:00, vvaintroub@wva. +5 -7
    Fix build on Windows 2008 SDK (version 6.1)
    
    Increase _WIN32_WINNT to Win2000 level to be able to use 
    iphlpapi headers (referenced in my_gethwaddr)

  mysys/my_gethwaddr.c@stripped, 2008-05-09 13:19:52+02:00, vvaintroub@wva. +0 -6
    Remove workaround for Bug 32082

diff -Nrup a/include/config-win.h b/include/config-win.h
--- a/include/config-win.h	2008-04-08 03:47:03 +02:00
+++ b/include/config-win.h	2008-05-09 13:19:51 +02:00
@@ -17,14 +17,12 @@
 
 #define BIG_TABLES
 
-#ifdef __WIN2000__
-/* We have to do this define before including windows.h to get the AWE API
-functions */
+/* 
+  Minimal version of Windows we should be able to run on.
+  Currently Windows 2000
+*/
 #define _WIN32_WINNT     0x0500
-#else
-/* Get NT 4.0 functions */
-#define _WIN32_WINNT     0x0400
-#endif
+
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 /* Avoid endless warnings about sprintf() etc. being unsafe. */
diff -Nrup a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
--- a/mysys/my_gethwaddr.c	2008-03-27 13:47:14 +01:00
+++ b/mysys/my_gethwaddr.c	2008-05-09 13:19:52 +02:00
@@ -102,12 +102,6 @@ err:
 }
 
 #elif defined(__WIN__)
-/* Workaround for BUG#32082 (Definition of VOID in my_global.h conflicts with windows
headers) */ 
-#ifdef VOID 
-#undef VOID 
-#define VOID void 
-#endif
-
 #include <iphlpapi.h>
 
 /*