diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-01 10:03:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-01 10:03:16 +0000 |
| commit | 323fa1ad90b66183cea1739a4860f4b4c4ae60f6 (patch) | |
| tree | 265dba74b7092aa8e37d3abbb02e5aebf5f51671 | |
| parent | b71c7cbd31909411bf2c9bda52c25de960061acb (diff) | |
| download | ATCD-323fa1ad90b66183cea1739a4860f4b4c4ae60f6.tar.gz | |
Tue Aug 1 10:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ace/OS_NS_netdb.inl | 8 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.3.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index 590f9ee969e..e496119bc32 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -261,7 +261,7 @@ ACE_OS::getipnodebyaddr (const void *src, size_t len, int family) ACE_UNUSED_ARG (family); ACE_NOTSUP_RETURN (0); # else - struct hostent *hptr; + struct hostent *hptr = 0; int errnum; if ((hptr = ::getipnodebyaddr (src, len, family, &errnum)) == 0) { @@ -284,7 +284,7 @@ ACE_INLINE struct hostent * ACE_OS::getipnodebyname (const char *name, int family, int flags) { ACE_OS_TRACE ("ACE_OS::getipnodebyname"); -# if defined (ACE_HAS_IPV6) && !defined (ACE_WIN32) +# if defined (ACE_HAS_IPV6) && !defined (ACE_LACKS_GETIPNODEBYNAME_IPV6) # if defined (ACE_LACKS_GETIPNODEBYNAME) ACE_UNUSED_ARG (flags); # if defined (ACE_HAS_NONCONST_GETBY) @@ -296,7 +296,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags) struct hostent *, 0); # endif /* ACE_HAS_NONCONST_GETBY */ # else - struct hostent *hptr; + struct hostent *hptr = 0; int errnum; if ((hptr = ::getipnodebyname (name, family, flags, &errnum)) == 0) { @@ -311,7 +311,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags) return ACE_OS::gethostbyname (name); ACE_NOTSUP_RETURN (0); -# endif /* defined (ACE_HAS_IPV6) && !defined (ACE_WIN32) */ +# endif /* defined (ACE_HAS_IPV6) && !ACE_LACKS_GETIPNODEBYNAME_IPV6 */ } ACE_INLINE struct protoent * diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h index 3bc169ec6c7..50a25a2bf4a 100644 --- a/ACE/ace/config-vxworks6.3.h +++ b/ACE/ace/config-vxworks6.3.h @@ -83,6 +83,7 @@ #define ACE_LACKS_GETPROTOBYNAME #define ACE_LACKS_GETPROTOBYNUMBER #define ACE_LACKS_GETIPNODEBYADDR +#define ACE_LACKS_GETIPNODEBYNAME_IPV6 #define ACE_LACKS_LSTAT #define ACE_LACKS_MADVISE #define ACE_LACKS_MALLOC_H diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index d237e64aa95..03df5f05f72 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -248,6 +248,7 @@ #define ACE_LACKS_FORK #define ACE_LACKS_GETHOSTENT #define ACE_LACKS_GETOPT +#define ACE_LACKS_GETIPNODEBYNAME_IPV6 #define ACE_LACKS_KILL #define ACE_LACKS_INET_ATON #define ACE_LACKS_MADVISE |