Chromium Code Reviews| Index: net/server/http_server.cc |
| diff --git a/net/server/http_server.cc b/net/server/http_server.cc |
| index f4a228d701ea8c69a44a309fb95820261352579b..460a9801258f3e1137e5ed92ed362155bfa453ab 100644 |
| --- a/net/server/http_server.cc |
| +++ b/net/server/http_server.cc |
| @@ -1,10 +1,14 @@ |
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| +// 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. |
| +#include "net/server/http_server.h" |
| + |
| #include <map> |
| -#ifdef _WIN32 |
| +#include "build/build_config.h" |
|
willchan no longer on Chromium
2011/04/17 17:30:00
I believe http://dev.chromium.org/developers/codin
tfarina
2011/04/18 00:17:15
Yup, fixed.
|
| + |
| +#if defined(OS_WIN) |
| #include <winsock2.h> |
| #else |
| #include <arpa/inet.h> |
| @@ -16,10 +20,12 @@ |
| #include "base/string_number_conversions.h" |
| #include "base/string_util.h" |
| #include "base/stringprintf.h" |
| -#include "net/server/http_server.h" |
| #include "net/server/http_server_request_info.h" |
| +namespace net { |
| + |
| int HttpServer::Connection::lastId_ = 0; |
| + |
| HttpServer::HttpServer(const std::string& host, |
| int port, |
| HttpServer::Delegate* del) |
| @@ -433,3 +439,5 @@ HttpServer::Connection* HttpServer::FindConnection(ListenSocket* socket) { |
| return NULL; |
| return it->second; |
| } |
| + |
| +} // namespace net |