Fix wchar build failures

nickwilliams-zaxiom · nickwilliams-zaxiom · commit 4cc242590fb7 · 2023-09-21T17:27:49.000-05:00
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
@@ -835,7 +835,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
           else if ((num_if && pAddrs->Ipv6IfIndex == static_cast<unsigned int>(if_ix))
                    || (!num_if &&
                        (ACE_OS::strcmp (net_if_char, pAddrs->AdapterName) == 0
-                        || ACE_OS::strcmp (net_if_char, pAddrs->FriendlyName) == 0)))
+                        || ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR (net_if_char), pAddrs->FriendlyName) == 0)))
             {
               lmreq.ipv6mr_interface = pAddrs->Ipv6IfIndex;
               break;

Original file line number	Diff line number	Diff line change
`@@ -835,7 +835,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,`
`835`	`835`	`else if ((num_if && pAddrs->Ipv6IfIndex == static_cast<unsigned int>(if_ix))`
`836`	`836`	`\|\| (!num_if &&`
`837`	`837`	`(ACE_OS::strcmp (net_if_char, pAddrs->AdapterName) == 0`
`838`		`- \|\| ACE_OS::strcmp (net_if_char, pAddrs->FriendlyName) == 0)))`
	`838`	`+ \|\| ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR (net_if_char), pAddrs->FriendlyName) == 0)))`
`839`	`839`	`{`
`840`	`840`	`lmreq.ipv6mr_interface = pAddrs->Ipv6IfIndex;`
`841`	`841`	`break;`