merge

16 years ago · 2b2ef99ebf
1 changed files with 8 additions and 0 deletions
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@ -102,6 +102,14 @@ 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>

 /*