mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 08:34:28 +02:00
merge
This commit is contained in:
commit
2b2ef99ebf
1 changed files with 8 additions and 0 deletions
|
|
@ -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>
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue