merge

ff3acc31 · Vladislav Vaintroub · 47fedb97 · b5f83da9 · ff3acc31
Commit ff3acc31 authored Sep 23, 2009 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

mysys/my_gethwaddr.c mysys/my_gethwaddr.c +8 -0

No files found.
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -102,6 +102,14 @@ my_bool my_gethwaddr(uchar *to)
 }

 #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>

 /*