diff options
| author | Max Kellermann <max@duempel.org> | 2011-12-13 21:57:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-12-13 21:57:44 +0100 |
| commit | aa4f45b9a56779355f15f867dce9ab0759cb5f7a (patch) | |
| tree | e0793dfab38b5540a02c8a8e3d4f2612fe2c3faa /src/utils.c | |
| parent | 006b8fa3f07e948cbd277e91546dd815769d7a5e (diff) | |
| parent | 96ad5b84446be0bf603895adaf0ec2e97bee11aa (diff) | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/utils.c')
| -rw-r--r-- | src/utils.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/utils.c b/src/utils.c index d3b21d36..a2de3212 100644 --- a/src/utils.c +++ b/src/utils.c @@ -34,7 +34,11 @@ #include <pwd.h> #endif -#ifdef HAVE_IPV6 +#if HAVE_IPV6 && WIN32 +#include <winsock2.h> +#endif + +#if HAVE_IPV6 && ! WIN32 #include <sys/socket.h> #endif |