diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-13 19:38:06 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-13 19:38:06 +0200 |
| commit | 12cea944fc705b9b88d8750a61a2c8b3b53386f9 (patch) | |
| tree | 634ca08e006a17647ee057a53c6101dc5cd9f1af /mysys/my_gethwaddr.c | |
| parent | fc8db5e9ea231da4e8f5af3b38a12688d1590d53 (diff) | |
| download | mariadb-git-12cea944fc705b9b88d8750a61a2c8b3b53386f9.tar.gz | |
fix compile error. definition of VOID in trunk still conflicts with windows headers. that was fixed in 6.0
Diffstat (limited to 'mysys/my_gethwaddr.c')
| -rw-r--r-- | mysys/my_gethwaddr.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 7fae1a51446..38fa0313c5d 100644 --- 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> /* |