diff options
Diffstat (limited to 'ace/Sock_Connect.cpp')
| -rw-r--r-- | ace/Sock_Connect.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index cad9402c1e1..99229c7c3f9 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -59,12 +59,14 @@ const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTER #if defined (ACE_HAS_WINCE) #include /**/ <Iphlpapi.h> +# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) // The following code is suggested by microsoft as a workaround to the fact // that on Windows CE, these constants are exported as function addresses // rather than simply values. # include /**/ <ws2tcpip.h> const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; +# endif #endif // ACE_HAS_WINCE #if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) @@ -425,8 +427,8 @@ ACE::get_fqdn (ACE_INET_Addr const & addr, if (ACE::debug()) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ") - ACE_TEXT ("canonical host name is %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (hp->h_name))); + ACE_TEXT ("canonical host name is %C\n"), + hp->h_name)); // check if the canonical name is the FQDN if (!ACE_OS::strchr(hp->h_name, '.')) @@ -458,8 +460,8 @@ ACE::get_fqdn (ACE_INET_Addr const & addr, if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ") - ACE_TEXT ("found fqdn within alias as %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(*q))); + ACE_TEXT ("found fqdn within alias as %C\n"), + *q)); ACE_OS::strcpy (hostname, *q); return 0; @@ -491,7 +493,7 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) && defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) // moved the ACE_HAS_WINCE impl ahaid of ACE_HAS_WINSOCK2 because // WINCE in fact has winsock2, but doesn't properly support the // WSAIoctl for obtaining IPv6 address info. @@ -603,7 +605,7 @@ get_ip_interfaces_win32 (size_t &count, // kernel says there are no more of that type. const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp; + EK_TCPIPCFG *devp = 0; size_t i, j; ACE_TCHAR dev_name[16]; |