@@ -123,7 +123,7 @@ std::string InetAddress::toIpPortNetEndian() const
123123 std::string buf;
124124 static constexpr auto bytes = sizeof (addr_.sin_port );
125125 buf.resize (bytes);
126- #if defined _MSC_VER && _MSC_VER >= 1900
126+ #if defined _WIN32
127127 std::memcpy ((PVOID)&buf[0 ], (PVOID)&addr_.sin_port , bytes);
128128#else
129129 std::memcpy (&buf[0 ], &addr_.sin_port , bytes);
@@ -201,15 +201,15 @@ std::string InetAddress::toIp() const
201201 char buf[64 ];
202202 if (addr_.sin_family == AF_INET)
203203 {
204- #if defined _MSC_VER && _MSC_VER >= 1900
204+ #if defined _WIN32
205205 ::inet_ntop (AF_INET, (PVOID)&addr_.sin_addr, buf, sizeof(buf));
206206#else
207207 ::inet_ntop (AF_INET, &addr_.sin_addr, buf, sizeof (buf));
208208#endif
209209 }
210210 else if (addr_.sin_family == AF_INET6)
211211 {
212- #if defined _MSC_VER && _MSC_VER >= 1900
212+ #if defined _WIN32
213213 ::inet_ntop (AF_INET6, (PVOID)&addr6_.sin6_addr, buf, sizeof(buf));
214214#else
215215 ::inet_ntop (AF_INET6, &addr6_.sin6_addr, buf, sizeof (buf));
@@ -226,7 +226,7 @@ std::string InetAddress::toIpNetEndian() const
226226 {
227227 static constexpr auto bytes = sizeof (addr_.sin_addr .s_addr );
228228 buf.resize (bytes);
229- #if defined _MSC_VER && _MSC_VER >= 1900
229+ #if defined _WIN32
230230 std::memcpy ((PVOID)&buf[0 ], (PVOID)&addr_.sin_addr .s_addr , bytes);
231231#else
232232 std::memcpy (&buf[0 ], &addr_.sin_addr .s_addr , bytes);
@@ -236,7 +236,7 @@ std::string InetAddress::toIpNetEndian() const
236236 {
237237 static constexpr auto bytes = sizeof (addr6_.sin6_addr );
238238 buf.resize (bytes);
239- #if defined _MSC_VER && _MSC_VER >= 1900
239+ #if defined _WIN32
240240 std::memcpy ((PVOID)&buf[0 ], (PVOID)ip6NetEndian (), bytes);
241241#else
242242 std::memcpy (&buf[0 ], ip6NetEndian (), bytes);
0 commit comments