Handle h_addr in a more libc independent way.

native_client_sdk/src/libraries/nacl_io/host_resolver.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "nacl_io/host_resolver.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 178 matching lines @@
         sockaddr_in6* in6 = reinterpret_cast<sockaddr_in6*>(current->ai_addr);
         memcpy(*hostent_addr, &in6->sin6_addr.s6_addr, hostent_.h_length);
         break;
       }
     }
     current = current->ai_next;
     hostent_addr++;
   }
 
   freeaddrinfo(ai);
+
+  // Copy element zero of h_addr_list to h_addr as in some libc's h_addr may be
+  // a macro, but in others it may be a separate member.
+  hostent_.haddr = hostent_.h_addr_list[0];

[Sam Clegg, 2014/05/07 23:20:15]

With the compiler not warn about self-assignment here on the cases where they
are that same thing?

+
   return &hostent_;
 }
 
 void HostResolver::freeaddrinfo(struct addrinfo *res) {
   while (res) {
     struct addrinfo* cur = res;
     res = res->ai_next;
     free(cur->ai_addr);
     free(cur->ai_canonname);
     free(cur);
@@ skipping 200 matching lines @@
   }
   if (NULL != hostent_.h_addr_list) {
     for (int i = 0;  NULL != hostent_.h_addr_list[i]; i++) {
       free(hostent_.h_addr_list[i]);
     }
     free(hostent_.h_addr_list);
   }
   hostent_.h_name = NULL;
   hostent_.h_aliases = NULL;
   hostent_.h_addr_list = NULL;
+  hostent_.h_addr = NULL;
 }
 
 }  // namespace nacl_io
 
 #endif  // PROVIDES_SOCKET_API