diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2022-10-14 06:04:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 06:04:13 -0500 |
| commit | f4512003c2fd03a7471c98a3a56a36353bfef15d (patch) | |
| tree | f8c6dc619c992de539da66ea23a6eaba85bb735b /ACE/ace/OS_NS_arpa_inet.cpp | |
| parent | f63ede24b58993e439c94cf8a3b01773debfba17 (diff) | |
| parent | db4f0fb92002573b6b0c571d891ea9fe4e3706be (diff) | |
| download | ATCD-f4512003c2fd03a7471c98a3a56a36353bfef15d.tar.gz | |
Merge pull request #1965 from DOCGroup/ocielliottc/a6t2-merge
Merged pull requests 1953 and 1955-1958
Diffstat (limited to 'ACE/ace/OS_NS_arpa_inet.cpp')
| -rw-r--r-- | ACE/ace/OS_NS_arpa_inet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index 0cc14c302b8..c6ac255f461 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -85,7 +85,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) return 1; } # endif // ACE_LACKS_INET_ADDR -#elif defined (ACE_VXWORKS) +#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x700) // inet_aton() returns OK (0) on success and ERROR (-1) on failure. // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026 ::errnoSet(0); |