commit f6d6ed0c66457170be3f3b2bc214cd7141e441a4
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jan 03 22:08:47 2014 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jan 03 22:08:47 2014 +0000
tree 5024a88350156bc8f7931479c3fcc845f5981f82
parent e667234ee2067470ebc3e781c39121e2201cb55f

Update talk to 59039880.

R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6569004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5339 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/nethelpers.cc

diff --git a/talk/base/nethelpers.cc b/talk/base/nethelpers.cc
index e6310ac..e4d0c52 100644
--- a/talk/base/nethelpers.cc
+++ b/talk/base/nethelpers.cc
@@ -40,6 +40,11 @@
 
 int ResolveHostname(const std::string& hostname, int family,
                     std::vector<IPAddress>* addresses) {
+#ifdef __native_client__
+  ASSERT(false);
+  LOG(LS_WARNING) << "ResolveHostname() is not implemented for NaCl";
+  return -1;
+#else  // __native_client__
   if (!addresses) {
     return -1;
   }
@@ -64,6 +69,7 @@
   }
   freeaddrinfo(result);
   return 0;
+#endif  // !__native_client__
 }
 
 // AsyncResolver