Fix wchar build failures

nickwilliams-zaxiom · nickwilliams-zaxiom · commit d11971f45303 · 2023-09-21T17:25:38.000-05:00
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
@@ -684,7 +684,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
           while (pAddrs && set_result == -1)
             {
               if (ACE_OS::strcmp (net_if_char, pAddrs->AdapterName) == 0 ||
-                  ACE_OS::strcmp (ACE_TEXT_ALWAYS_WCHAR (net_if_char), pAddrs->FriendlyName) == 0)
+                  ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR (net_if_char), pAddrs->FriendlyName) == 0)
                 {
                   PIP_ADAPTER_UNICAST_ADDRESS pUnicast = pAddrs->FirstUnicastAddress;
                   LPSOCKADDR sa = pUnicast->Address.lpSockaddr;

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,`
`684`	`684`	`while (pAddrs && set_result == -1)`
`685`	`685`	`{`
`686`	`686`	`if (ACE_OS::strcmp (net_if_char, pAddrs->AdapterName) == 0 \|\|`
`687`		`- ACE_OS::strcmp (ACE_TEXT_ALWAYS_WCHAR (net_if_char), pAddrs->FriendlyName) == 0)`
	`687`	`+ ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR (net_if_char), pAddrs->FriendlyName) == 0)`
`688`	`688`	`{`
`689`	`689`	`PIP_ADAPTER_UNICAST_ADDRESS pUnicast = pAddrs->FirstUnicastAddress;`
`690`	`690`	`LPSOCKADDR sa = pUnicast->Address.lpSockaddr;`