net/dns/dns_config_service_posix.h - Issue 8336024: OpenBSD patches for net, split from CR #8275005

Side by Side Diff: net/dns/dns_config_service_posix.h

Issue 8336024: OpenBSD patches for net, split from CR #8275005 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: add missing crypto patch Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_	5 #ifndef NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_

6 #define NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_	6 #define NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_

7 #pragma once	7 #pragma once

8	8

	9 #include "build/build_config.h"

	10

	11 #if defined(OS_OPENBSD)

	12 #include <sys/types.h>

	13 #include <sys/socket.h>

	14 #include <netinet/in.h>

	15 #endif
	wtc 2011/10/18 21:50:26 Note: it may be better to use a forward declaratio Note: it may be better to use a forward declaration of struct __res_state in this header, and move the system header inclusions to .cc files. I recommend removing the #if defined(OS_OPENBSD). Is <sys/socket.h> necessary? From what I found in old Unix man pages, these headers should be included: #include <sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> http://download.oracle.com/docs/cd/E19109-01/tsolaris8/835-8004/6ruu29hft/ind... http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ib... http://nixdoc.net/man-pages/Tru64/res_mkquery.3.html Robert Nagy 2011/10/19 07:10:02 Yes it makes sense to include these headers everyw Show quoted text On 2011/10/18 21:50:26, wtc wrote: > > Note: it may be better to use a forward declaration of > struct __res_state in this header, and move the system > header inclusions to .cc files. > > I recommend removing the #if defined(OS_OPENBSD). > > Is <sys/socket.h> necessary? From what I found in old Unix > man pages, these headers should be included: > > #include <sys/types.h> > #include <netinet/in.h> > #include <arpa/nameser.h> > #include <resolv.h> > > http://download.oracle.com/docs/cd/E19109-01/tsolaris8/835-8004/6ruu29hft/ind... > http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ib... > http://nixdoc.net/man-pages/Tru64/res_mkquery.3.html Yes it makes sense to include these headers everywhere. Which i've done in the new patchset, but I kept them in the header file.
	16

9 #include <resolv.h>	17 #include <resolv.h>

10	18

11 #include "base/compiler_specific.h"	19 #include "base/compiler_specific.h"

12 #include "base/memory/scoped_ptr.h"	20 #include "base/memory/scoped_ptr.h"

13 #include "net/base/net_export.h"	21 #include "net/base/net_export.h"

14 #include "net/dns/dns_config_service.h"	22 #include "net/dns/dns_config_service.h"

15	23

16 namespace net {	24 namespace net {

17	25

18 class WatchingFileReader;	26 class WatchingFileReader;

(...skipping 14 matching lines...) Expand all Loading...
33 DISALLOW_COPY_AND_ASSIGN(DnsConfigServicePosix);	41 DISALLOW_COPY_AND_ASSIGN(DnsConfigServicePosix);

34 };	42 };

35	43

36 // Fills in \|dns_config\| from \|res\|. Exposed for tests.	44 // Fills in \|dns_config\| from \|res\|. Exposed for tests.

37 bool NET_EXPORT_PRIVATE ConvertResToConfig(const struct __res_state& res,	45 bool NET_EXPORT_PRIVATE ConvertResToConfig(const struct __res_state& res,

38 DnsConfig* dns_config);	46 DnsConfig* dns_config);

39	47

40 } // namespace net	48 } // namespace net

41	49

42 #endif // NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_	50 #endif // NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_

OLD	NEW

« net/base/host_resolver_proc.cc ('K') | « net/base/net_util.h ('k') | net/dns/dns_config_service_posix.cc » ('j') | net/dns/dns_config_service_posix.cc » ('J')