MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:September 13 2009 5:38pm
Subject:bzr commit into mysql-5.4 branch (vvaintroub:2879)
View as plain text  
#At file:///H:/bzr/xxx/ based on revid:vvaintroub@stripped

 2879 Vladislav Vaintroub	2009-09-13
      fix compile error. definition of VOID in trunk still conflicts with windows headers. that was fixed in 6.0

    modified:
      mysys/my_gethwaddr.c
=== modified file 'mysys/my_gethwaddr.c'
--- a/mysys/my_gethwaddr.c	2009-09-11 20:42:39 +0000
+++ b/mysys/my_gethwaddr.c	2009-09-13 17:38:06 +0000
@@ -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>
 
 /* 


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20090913173806-tpr2op2gh6ryy89s.bundle
Thread
bzr commit into mysql-5.4 branch (vvaintroub:2879)Vladislav Vaintroub13 Sep