Handle h_addr in a more libc independent way.

native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc

Index: native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc b/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
index b5810c017af9d16266db5b4a91e0c328837d6d9f..f44b1c80ead29f5de7877c5df380288b77cc0120 100644
--- a/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
@@ -323,6 +323,10 @@ TEST_F(FakeHostResolverTest, Gethostbyname) {
   ASSERT_EQ(NULL, addr_list[1]);
   in_addr_t exptected_addr = htonl(FAKE_IP);
   ASSERT_EQ(exptected_addr, *addr_list[0]);
+  // Check that h_addr also matches as in some libc's it may be a separate
+  // member.
+  in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+  ASSERT_EQ(exptected_addr, *first_addr);

[binji, 2014/05/07 22:35:04]

rename this to expected_addr

[bradn, 2014/05/07 22:39:06]

Done.

 }
 
 TEST_F(FakeHostResolverTest, Gethostbyname_Failure) {
@@ -346,6 +350,10 @@ TEST_F(HostResolverTest, Gethostbyname_Numeric) {
   ASSERT_NE(reinterpret_cast<in_addr_t**>(NULL), addr_list);
   ASSERT_EQ(NULL, addr_list[1]);
   ASSERT_EQ(inet_addr("8.8.8.8"), *addr_list[0]);
+  // Check that h_addr also matches as in some libc's it may be a separate
+  // member.
+  in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+  ASSERT_EQ(inet_addr("8.8.8.8"), *first_addr);
 }
 
 // These utility functions are only used for newlib (glibc provides its own