diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 09:55:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:17:41 -0400 |
| commit | 5c040fccd0ddbe6df248fd7b9ff44400fa0d7004 (patch) | |
| tree | 738dfcdb3e728ab6c2f4f0bbfbaaae440016b3c5 /cpp/src/Ice/Network.cpp | |
| parent | Fix ICE-7679 - Python Application.NoSignalHandling not honor by Ice.Application (diff) | |
| download | ice-5c040fccd0ddbe6df248fd7b9ff44400fa0d7004.tar.bz2 ice-5c040fccd0ddbe6df248fd7b9ff44400fa0d7004.tar.xz ice-5c040fccd0ddbe6df248fd7b9ff44400fa0d7004.zip | |
ICE-7483 - Rename OS X to macOS
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 6ea1e542ac6..a903f6b26c9 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -933,7 +933,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol // In theory, getaddrinfo should only return EAI_NONAME if // AI_NUMERICHOST is specified and the host name is not a IP - // address. However on some platforms (e.g. OS X 10.4.x) + // address. However on some platforms (e.g. macOS 10.4.x) // EAI_NODATA is also returned so we also check for it. # ifdef EAI_NODATA if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA)) @@ -1238,10 +1238,10 @@ IceInternal::closeSocket(SOCKET fd) WSASetLastError(error); #else int error = errno; - + # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) // - // FreeBSD returns ECONNRESET if the underlying object was + // FreeBSD returns ECONNRESET if the underlying object was // a stream socket that was shut down by the peer before all // pending data was delivered. // |