diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:50 +0100 |
| commit | ac8dd6beb917f9b8d14409b565f259043d816e2b (patch) | |
| tree | 2dcd19f605758aa9c34ca77b4eb1bb46bcc4e50f /mysys | |
| parent | dfc1901e806bdda129b8943585f2ccfc8c207322 (diff) | |
| parent | 6be24a771a27a077d58d21a4a1f8db3fbd14cac4 (diff) | |
| download | mariadb-git-ac8dd6beb917f9b8d14409b565f259043d816e2b.tar.gz | |
merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethwaddr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 4360daca6f8..21bbdfef997 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -129,6 +129,7 @@ err: #elif defined(_WIN32) #include <winsock2.h> #include <iphlpapi.h> +#pragma comment(lib, "iphlpapi.lib")
#define ETHER_ADDR_LEN 6 @@ -142,7 +143,7 @@ my_bool my_gethwaddr(uchar *to) if (GetAdaptersInfo(info, &info_len) != ERROR_BUFFER_OVERFLOW) goto err; - info= alloca(info_len); + info= (IP_ADAPTER_INFO *)alloca(info_len); if (GetAdaptersInfo(info, &info_len) != NO_ERROR) goto err; |