diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 06:33:05 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 06:33:05 +0000 |
| commit | a27de26525a6c29024e7a0416f0e6c7b358bf84e (patch) | |
| tree | 3e6cd5e359a052e562b7b1123249e61182644285 /net | |
| parent | f35e3cf76a14422c20706ff26a2688cdcf88e8db (diff) | |
| download | chromium_src-a27de26525a6c29024e7a0416f0e6c7b358bf84e.zip chromium_src-a27de26525a6c29024e7a0416f0e6c7b358bf84e.tar.gz chromium_src-a27de26525a6c29024e7a0416f0e6c7b358bf84e.tar.bz2 | |
net doesn't depend on libevent directly now.
Remove unnecessary forward declarations of struct event and inclusions
of the event.h header.
Use MessageLoopForIO::FileDescriptorWatcher and MessageLoopForIO::Watcher
typedefs.
R=mark@chromium.org,rvargas@chromium.org
BUG=none
TEST=no build errors
Review URL: http://codereview.chromium.org/7232002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/listen_socket.cc | 5 | ||||
| -rw-r--r-- | net/base/listen_socket.h | 1 | ||||
| -rw-r--r-- | net/net.gyp | 3 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_libevent.cc | 5 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_libevent.h | 2 | ||||
| -rw-r--r-- | net/socket/tcp_server_socket_libevent.cc | 5 | ||||
| -rw-r--r-- | net/udp/udp_socket_libevent.cc | 5 |
7 files changed, 0 insertions, 26 deletions
diff --git a/net/base/listen_socket.cc b/net/base/listen_socket.cc index c97b2c6..0971784 100644 --- a/net/base/listen_socket.cc +++ b/net/base/listen_socket.cc @@ -14,11 +14,6 @@ #include <sys/socket.h> #include <arpa/inet.h> #include "net/base/net_errors.h" -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif #endif #include "base/eintr_wrapper.h" diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h index 8136667..6a276b2 100644 --- a/net/base/listen_socket.h +++ b/net/base/listen_socket.h @@ -30,7 +30,6 @@ #include "net/base/net_api.h" #if defined(OS_POSIX) -struct event; // From libevent typedef int SOCKET; #endif diff --git a/net/net.gyp b/net/net.gyp index 714eacc..95ebf9c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -794,9 +794,6 @@ ], }, { # else: OS != "win" - 'dependencies': [ - '../third_party/libevent/libevent.gyp:libevent', - ], 'sources!': [ 'base/winsock_init.cc', 'base/winsock_init.h', diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc index 2e4c97d..8540342 100644 --- a/net/socket/tcp_client_socket_libevent.cc +++ b/net/socket/tcp_client_socket_libevent.cc @@ -26,11 +26,6 @@ #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif namespace net { diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h index b9bc557..607b9ee 100644 --- a/net/socket/tcp_client_socket_libevent.h +++ b/net/socket/tcp_client_socket_libevent.h @@ -15,8 +15,6 @@ #include "net/base/net_log.h" #include "net/socket/stream_socket.h" -struct event; // From libevent - namespace net { class BoundNetLog; diff --git a/net/socket/tcp_server_socket_libevent.cc b/net/socket/tcp_server_socket_libevent.cc index 89119f6..02c448a 100644 --- a/net/socket/tcp_server_socket_libevent.cc +++ b/net/socket/tcp_server_socket_libevent.cc @@ -14,11 +14,6 @@ #if defined(OS_POSIX) #include <netinet/in.h> #endif -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif #include "base/eintr_wrapper.h" #include "net/base/ip_endpoint.h" diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc index b3e208e..c451696 100644 --- a/net/udp/udp_socket_libevent.cc +++ b/net/udp/udp_socket_libevent.cc @@ -21,11 +21,6 @@ #if defined(OS_POSIX) #include <netinet/in.h> #endif -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif namespace net { |