diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:47:37 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:47:37 +0000 |
| commit | a540c2d2927d84f850bbe85c151e79965ae6e29b (patch) | |
| tree | b78177428ba1f731794f7c85ee41275089c6bdbe /net/socket | |
| parent | 707904a603fe25d4f9872a9c57244a5005cf7a16 (diff) | |
| download | chromium_src-a540c2d2927d84f850bbe85c151e79965ae6e29b.zip chromium_src-a540c2d2927d84f850bbe85c151e79965ae6e29b.tar.gz chromium_src-a540c2d2927d84f850bbe85c151e79965ae6e29b.tar.bz2 | |
Minor cleanup: add a sys_addrinfo.h header that hides the platform-specific includes needed for struct addrinfo / struct sockaddr, since we were duplicating that #if #else logic in a growing number of places.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/491038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/socks5_client_socket.cc | 7 | ||||
| -rw-r--r-- | net/socket/socks5_client_socket_unittest.cc | 8 | ||||
| -rw-r--r-- | net/socket/socks_client_socket.cc | 7 |
3 files changed, 4 insertions, 18 deletions
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index ef3e9d0..a2fabfd 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -5,17 +5,12 @@ #include "net/socket/socks5_client_socket.h" #include "base/basictypes.h" -#include "build/build_config.h" -#if defined(OS_WIN) -#include <ws2tcpip.h> -#elif defined(OS_POSIX) -#include <netdb.h> -#endif #include "base/compiler_specific.h" #include "base/trace_event.h" #include "net/base/io_buffer.h" #include "net/base/load_log.h" #include "net/base/net_util.h" +#include "net/base/sys_addrinfo.h" namespace net { diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index d79bd02..aa4c454 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -5,16 +5,12 @@ #include "net/socket/socks5_client_socket.h" #include <map> -#include "build/build_config.h" -#if defined(OS_WIN) -#include <ws2tcpip.h> -#elif defined(OS_POSIX) -#include <netdb.h> -#endif + #include "net/base/address_list.h" #include "net/base/load_log.h" #include "net/base/load_log_unittest.h" #include "net/base/mock_host_resolver.h" +#include "net/base/sys_addrinfo.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" #include "net/socket/client_socket_factory.h" diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc index 09c1dbd..db70461 100644 --- a/net/socket/socks_client_socket.cc +++ b/net/socket/socks_client_socket.cc @@ -5,17 +5,12 @@ #include "net/socket/socks_client_socket.h" #include "base/basictypes.h" -#include "build/build_config.h" -#if defined(OS_WIN) -#include <ws2tcpip.h> -#elif defined(OS_POSIX) -#include <netdb.h> -#endif #include "base/compiler_specific.h" #include "base/trace_event.h" #include "net/base/io_buffer.h" #include "net/base/load_log.h" #include "net/base/net_util.h" +#include "net/base/sys_addrinfo.h" namespace net { |