diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
| commit | 7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch) | |
| tree | 7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /cpp/src/Ice/Network.cpp | |
| parent | ICE-7707 Improved handling of argc/argv arguments (diff) | |
| parent | ICE-7483 - Rename OS X to macOS (diff) | |
| download | ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2 ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rwxr-xr-x | cpp/src/Ice/Network.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 572df1b4cfc..599f6537896 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1107,7 +1107,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(!canBlock && (rs == EAI_NONAME || rs == EAI_NODATA)) |