diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:18:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:18:38 +0000 |
| commit | 5cb40f1f4df412262c662caf696e83da94e8f911 (patch) | |
| tree | 66adb76dc98712072dc5e087371490c555ddac80 | |
| parent | 0dd2121530e13b8db48cc6ade62896d6fe14269d (diff) | |
| download | ATCD-5cb40f1f4df412262c662caf696e83da94e8f911.tar.gz | |
Wed Nov 28 13:18:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_arpa_inet.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0ac2fdf61cf..6757406524d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 28 13:18:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_arpa_inet.cpp: + Updated for VxWorks 6.6 + Wed Nov 28 13:08:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/sys/os_types.h: diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index 572422c044e..0ebf8a3dcc6 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -36,7 +36,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) addr->s_addr = ip_addr; // Network byte ordered return 1; } -#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650) +#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x660) // 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); |