diff options
| author |  Peter Powell | 2017-08-06 21:24:30 +0100 |
|---|---|---|
| committer |  GitHub | 2017-08-06 21:24:30 +0100 |
| commit | 6de3017e2cda445bfd9e6b460a35eae7fc199148 (patch) | |
| tree | 510ff17fb08d589cc6a096173a88dd45fe0f5a61 /src/socket.cpp | |
| parent | Merge pull request #1351 from SaberUK/master+webirc (diff) | |
| parent | Purge code for Windows XP and MSVC pre-2015. (diff) | |
| download | inspircd++-6de3017e2cda445bfd9e6b460a35eae7fc199148.tar.gz inspircd++-6de3017e2cda445bfd9e6b460a35eae7fc199148.tar.bz2 inspircd++-6de3017e2cda445bfd9e6b460a35eae7fc199148.zip | |
Merge pull request #1141 from SaberUK/master+windows-purge
Purge code for Windows XP and MSVC pre-2015.
Diffstat (limited to 'src/socket.cpp')
| -rw-r--r-- | src/socket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/socket.cpp b/src/socket.cpp index 17f13bb8a..018e0b0db 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -146,13 +146,13 @@ std::string irc::sockets::sockaddrs::addr() const char addrv[INET6_ADDRSTRLEN+1]; if (sa.sa_family == AF_INET) { - if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv))) + if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, addrv, sizeof(addrv))) return ""; return addrv; } else if (sa.sa_family == AF_INET6) { - if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv))) + if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, addrv, sizeof(addrv))) return ""; return addrv; } @@ -171,14 +171,14 @@ std::string irc::sockets::sockaddrs::str() const if (sa.sa_family == AF_INET) { char ipaddr[INET_ADDRSTRLEN]; - inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr)); + inet_ntop(AF_INET, (void*)&in4.sin_addr, ipaddr, sizeof(ipaddr)); return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port)); } if (sa.sa_family == AF_INET6) { char ipaddr[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr)); + inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ipaddr, sizeof(ipaddr)); return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port)); } |