| Index: net/tools/flip_server/flip_config.h
|
| diff --git a/net/tools/flip_server/flip_config.h b/net/tools/flip_server/flip_config.h
|
| index 454c4bf64698564cbc442f6252810cbc3647f067..90a4199f935cbf10678a276187212e28c5e40225 100644
|
| --- a/net/tools/flip_server/flip_config.h
|
| +++ b/net/tools/flip_server/flip_config.h
|
| @@ -2,10 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef NET_TOOLS_FLIP_PROXY_CONFIG_H
|
| -#define NET_TOOLS_FLIP_PROXY_CONFIG_H
|
| +#ifndef NET_TOOLS_FLIP_SERVER_FLIP_CONFIG_H_
|
| +#define NET_TOOLS_FLIP_SERVER_FLIP_CONFIG_H_
|
|
|
| -#include <arpa/inet.h> // in_addr_t
|
| +#include <arpa/inet.h>
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -16,9 +16,9 @@
|
| namespace net {
|
|
|
| enum FlipHandlerType {
|
| - FLIP_HANDLER_PROXY,
|
| - FLIP_HANDLER_SPDY_SERVER,
|
| - FLIP_HANDLER_HTTP_SERVER
|
| + FLIP_HANDLER_PROXY,
|
| + FLIP_HANDLER_SPDY_SERVER,
|
| + FLIP_HANDLER_HTTP_SERVER
|
| };
|
|
|
| class FlipAcceptor {
|
| @@ -38,7 +38,7 @@ class FlipAcceptor {
|
| int accepts_per_wake,
|
| bool reuseport,
|
| bool wait_for_iface,
|
| - void *memory_cache);
|
| + void* memory_cache);
|
| ~FlipAcceptor();
|
|
|
| enum FlipHandlerType flip_handler_type_;
|
| @@ -81,7 +81,7 @@ class FlipConfig {
|
| int accepts_per_wake,
|
| bool reuseport,
|
| bool wait_for_iface,
|
| - void *memory_cache);
|
| + void* memory_cache);
|
|
|
| std::vector<FlipAcceptor*> acceptors_;
|
| double server_think_time_in_s_;
|
| @@ -93,7 +93,6 @@ class FlipConfig {
|
| int idle_socket_timeout_s_;
|
| };
|
|
|
| -} // namespace
|
| -
|
| -#endif // NET_TOOLS_FLIP_PROXY_CONFIG_H
|
| +} // namespace net
|
|
|
| +#endif // NET_TOOLS_FLIP_SERVER_FLIP_CONFIG_H_
|
|
|