net/socket/web_socket_server_socket.cc - Issue 8949026: Move net/base/sys_byteorder.h to base/sys_byteorder.h - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(159)

My Issues | Starred Open | Closed | All

Unified Diff: net/socket/web_socket_server_socket.cc

Issue 8949026: Move net/base/sys_byteorder.h to base/sys_byteorder.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add documentation, fix Windows compile Created 9 years 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 side-by-side diff with in-line comments

« base/sys_byteorder.h ('K') | « net/server/web_socket.cc ('k') | net/spdy/spdy_frame_builder.h » ('j') | net/spdy/spdy_frame_builder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/web_socket_server_socket.cc

diff --git a/net/socket/web_socket_server_socket.cc b/net/socket/web_socket_server_socket.cc

index b86ac32e46e85c7f0dcc2e834df61df88f86a476..add4a55623077f5f6b7c511b3df677ed8f00a2cd 100644

--- a/net/socket/web_socket_server_socket.cc

+++ b/net/socket/web_socket_server_socket.cc

@@ -10,12 +10,6 @@

#include <map>

#include <vector>

-#if defined(OS_WIN)

-#include <winsock2.h> // for htonl

-#else

-#include <arpa/inet.h>

-#endif

-

#include "base/basictypes.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

@@ -26,6 +20,7 @@

#include "base/memory/weak_ptr.h"

#include "base/message_loop.h"

#include "base/string_util.h"

+#include "base/sys_byteorder.h"

#include "googleurl/src/gurl.h"

#include "net/base/completion_callback.h"

#include "net/base/io_buffer.h"

« base/sys_byteorder.h ('K') | « net/server/web_socket.cc ('k') | net/spdy/spdy_frame_builder.h » ('j') | net/spdy/spdy_frame_builder.h » ('J')

Powered by Google App Engine

This is Rietveld 408576698