OpenBSD patches for net, split from CR #8275005

net/dns/dns_config_service_posix.h

 // 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.
 
 #ifndef NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_
 #define NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_
 #pragma once
 
+#include "build/build_config.h"

[wtc, 2011/10/19 22:34:27]

Please remove this.  I believe this is not necessary now.

[Robert Nagy, 2011/10/20 07:37:43]

Done.

+
+#include <sys/types.h>

[cbentzel, 2011/10/19 19:35:18]

Should this includes be nested within OPENBSD conditionals?

[Robert Nagy, 2011/10/19 19:49:34]

I think it is totally fine on every posix system, and the less ifdefs we have,
the better.

[wtc, 2011/10/19 22:34:27]

<sys/types.h> used to be required on Unix in the early 1990s.
It is no longer required on most Unix platforms today, but
still required by OpenBSD.  It is harmless to include
<sys/types.h>.

+#include <netinet/in.h>
+#include <arpa/nameser.h>

[wtc, 2011/10/19 22:34:27]

Don't add <arpa/nameser.h> unless it's required by OpenBSD.

Note: in this file, we should include only the headers
required for the definition of struct __res.  All the other
system headers should be moved to dns_config_service_posix.cc.
So you need to read the compiler errors of
dns_config_service_posix.cc carefully and figure out which
system headers should be included by
dns_config_service_posix.h and which should be included by
dns_config_service_posix.cc.

[Robert Nagy, 2011/10/20 07:37:43]

I've removed nameser.h, but the others has to stay. __res is in resolv.h that
needs netinet/in.h and that needs sys/types.h.

 #include <resolv.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 #include "net/dns/dns_config_service.h"
 
 namespace net {
 
 class WatchingFileReader;
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DnsConfigServicePosix);
 };
 
 // Fills in |dns_config| from |res|. Exposed for tests.
 bool NET_EXPORT_PRIVATE ConvertResToConfig(const struct __res_state& res,
                                            DnsConfig* dns_config);
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_