OpenBSD patches for net, split from CR #8275005

net/base/host_resolver_proc.cc

 // Copyright (c) 2011 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 "net/base/host_resolver_proc.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "net/base/address_list.h"
 #include "net/base/dns_reloader.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include <resolv.h>
+#if defined(OS_OPENBSD)
+#define AI_ADDRCONFIG 0
 #endif
 
 namespace net {
 
 namespace {
 
 bool IsAllLocalhostOfOneFamily(const struct addrinfo* ai) {
   bool saw_v4_localhost = false;
   bool saw_v6_localhost = false;
   for (; ai != NULL; ai = ai->ai_next) {
@@ skipping 109 matching lines @@
       hints.ai_family = AF_INET6;
       break;
     case ADDRESS_FAMILY_UNSPECIFIED:
       hints.ai_family = AF_UNSPEC;
       break;
     default:
       NOTREACHED();
       hints.ai_family = AF_UNSPEC;
   }
 
-#if defined(OS_WIN) || defined(OS_OPENBSD)
+#if defined(OS_WIN)
   // DO NOT USE AI_ADDRCONFIG ON WINDOWS.
   //
   // The following comment in <winsock2.h> is the best documentation I found
   // on AI_ADDRCONFIG for Windows:
   //   Flags used in "hints" argument to getaddrinfo()
   //       - AI_ADDRCONFIG is supported starting with Vista
   //       - default is AI_ADDRCONFIG ON whether the flag is set or not
   //         because the performance penalty in not having ADDRCONFIG in
   //         the multi-protocol stack environment is severe;
   //         this defaulting may be disabled by specifying the AI_ALL flag,
@@ skipping 75 matching lines @@
 #endif
 
     return ERR_NAME_NOT_RESOLVED;
   }
 
   *addrlist = AddressList::CreateByAdoptingFromSystem(ai);
   return OK;
 }
 
 }  // namespace net