Revert "Merge pull request #16158 from apolcyn/revert_windows_breakage"

This reverts commit d9e8f86675cf923714b3ead4b06087e14a88c08c, reversing
changes made to 04847aeb1e62bc528d88fa3c47daa24a4cf629b3.

1 files changed, 7 insertions, 2 deletions

diff --git a/third_party/address_sorting/address_sorting.c b/third_party/address_sorting/address_sorting.c
index e4f3b53799..9aee0a5419 100644
--- a/third_party/address_sorting/address_sorting.c
+++ b/third_party/address_sorting/address_sorting.c
@@ -55,12 +55,17 @@ static const int kIPv6AddrScopeGlobal = 3;
 static address_sorting_source_addr_factory* g_current_source_addr_factory =
     NULL;
 
-static int address_sorting_get_source_addr(const address_sorting_address* dest,
-                                           address_sorting_address* source) {
+static bool address_sorting_get_source_addr(const address_sorting_address* dest,
+                                            address_sorting_address* source) {
   return g_current_source_addr_factory->vtable->get_source_addr(
       g_current_source_addr_factory, dest, source);
 }
 
+bool address_sorting_get_source_addr_for_testing(
+    const address_sorting_address* dest, address_sorting_address* source) {
+  return address_sorting_get_source_addr(dest, source);
+}
+
 static int ipv6_prefix_match_length(const struct sockaddr_in6* sa,
                                     const struct sockaddr_in6* sb) {
   unsigned char* a = (unsigned char*)&sa->sin6_addr;