summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 00:47:37 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 00:47:37 +0000
commita540c2d2927d84f850bbe85c151e79965ae6e29b (patch)
treeb78177428ba1f731794f7c85ee41275089c6bdbe /net/websockets
parent707904a603fe25d4f9872a9c57244a5005cf7a16 (diff)
downloadchromium_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/websockets')
-rw-r--r--net/websockets/websocket_throttle.cc7
-rw-r--r--net/websockets/websocket_throttle_unittest.cc9
2 files changed, 2 insertions, 14 deletions
diff --git a/net/websockets/websocket_throttle.cc b/net/websockets/websocket_throttle.cc
index db41248..8d0d1fb 100644
--- a/net/websockets/websocket_throttle.cc
+++ b/net/websockets/websocket_throttle.cc
@@ -4,12 +4,6 @@
#include "net/websockets/websocket_throttle.h"
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
#include <string>
#include "base/message_loop.h"
@@ -17,6 +11,7 @@
#include "base/singleton.h"
#include "base/string_util.h"
#include "net/base/io_buffer.h"
+#include "net/base/sys_addrinfo.h"
#include "net/socket_stream/socket_stream.h"
namespace net {
diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc
index 3757a0b..55276e9 100644
--- a/net/websockets/websocket_throttle_unittest.cc
+++ b/net/websockets/websocket_throttle_unittest.cc
@@ -2,19 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
-
#include <string>
#include "base/message_loop.h"
#include "googleurl/src/gurl.h"
#include "net/base/address_list.h"
+#include "net/base/sys_addrinfo.h"
#include "net/base/test_completion_callback.h"
#include "net/socket_stream/socket_stream.h"
#include "net/websockets/websocket_throttle.h"