diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 18:16:58 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 18:16:58 +0000 |
| commit | e97831dd75f59483cca12b7cb397bdbc0e945cd4 (patch) | |
| tree | f5ec6d49617faeeaaa45c0dc08887c6587330881 /net/base | |
| parent | 227b543c559f7d0ca172964494dce5b216f235ef (diff) | |
| download | chromium_src-e97831dd75f59483cca12b7cb397bdbc0e945cd4.zip chromium_src-e97831dd75f59483cca12b7cb397bdbc0e945cd4.tar.gz chromium_src-e97831dd75f59483cca12b7cb397bdbc0e945cd4.tar.bz2 | |
Allow using system libevent instead of the bundled one.
Patch by Bernard Cafarelli <voyageur@gentoo.org>
TEST=none
BUG=22140
Review URL: http://codereview.chromium.org/524061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/listen_socket.cc | 4 | ||||
| -rw-r--r-- | net/base/telnet_server.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/base/listen_socket.cc b/net/base/listen_socket.cc index fd099b7..88e9592 100644 --- a/net/base/listen_socket.cc +++ b/net/base/listen_socket.cc @@ -13,8 +13,12 @@ #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" #include "net/base/net_util.h" diff --git a/net/base/telnet_server.cc b/net/base/telnet_server.cc index 51ebf35..91c6cac 100644 --- a/net/base/telnet_server.cc +++ b/net/base/telnet_server.cc @@ -13,7 +13,11 @@ #include <sys/socket.h> #include "base/message_loop.h" #include "net/base/net_errors.h" +#if defined(USE_SYSTEM_LIBEVENT) +#include <event.h> +#else #include "third_party/libevent/event.h" +#endif #include "base/message_pump_libevent.h" #endif |