diff options
| author | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 16:00:24 +0000 |
|---|---|---|
| committer | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 16:00:24 +0000 |
| commit | 78144dac10f4cc05517a0bde375b001dca004bbc (patch) | |
| tree | ec00ee0e43ee96a99842ac9b260421aba8af16da /third_party | |
| parent | 5724aa93f84730ee61a7bf4406d648f86196d11b (diff) | |
| download | chromium_src-78144dac10f4cc05517a0bde375b001dca004bbc.zip chromium_src-78144dac10f4cc05517a0bde375b001dca004bbc.tar.gz chromium_src-78144dac10f4cc05517a0bde375b001dca004bbc.tar.bz2 | |
libevent: fix include style
We always want to include the local headers instead of eventually installed
ones. Removes the workaround from the gyp build file as that is the wrong and
unsafe fix.
Review URL: http://codereview.chromium.org/8438070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libevent/chromium.patch | 13 | ||||
| -rw-r--r-- | third_party/libevent/evdns.c | 2 | ||||
| -rw-r--r-- | third_party/libevent/evhttp.h | 2 | ||||
| -rw-r--r-- | third_party/libevent/libevent.gyp | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/third_party/libevent/chromium.patch b/third_party/libevent/chromium.patch index af43e719..31bc327 100644 --- a/third_party/libevent/chromium.patch +++ b/third_party/libevent/chromium.patch @@ -1,3 +1,16 @@ +diff --git a/third_party/libevent/evdns.c b/third_party/libevent/evdns.c +index f07ecc9..da6ea19 100644 +--- a/third_party/libevent/evdns.c ++++ b/third_party/libevent/evdns.c +@@ -134,7 +134,7 @@ + typedef ev_uint8_t u_char; + typedef unsigned int uint; + #endif +-#include <event.h> ++#include "event.h" + + #define u64 ev_uint64_t + #define u32 ev_uint32_t diff --git a/third_party/libevent/evdns.h b/third_party/libevent/evdns.h index 1eb5c38..fca4ac3 100644 --- a/third_party/libevent/evdns.h diff --git a/third_party/libevent/evdns.c b/third_party/libevent/evdns.c index f07ecc9..da6ea19 100644 --- a/third_party/libevent/evdns.c +++ b/third_party/libevent/evdns.c @@ -134,7 +134,7 @@ typedef ev_uint8_t u_char; typedef unsigned int uint; #endif -#include <event.h> +#include "event.h" #define u64 ev_uint64_t #define u32 ev_uint32_t diff --git a/third_party/libevent/evhttp.h b/third_party/libevent/evhttp.h index 99d16a2..30dee8b 100644 --- a/third_party/libevent/evhttp.h +++ b/third_party/libevent/evhttp.h @@ -27,7 +27,7 @@ #ifndef _EVHTTP_H_ #define _EVHTTP_H_ -#include <event.h> +#include "event.h" #ifdef __cplusplus extern "C" { diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 55b19cd..5341a55 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -32,10 +32,6 @@ 'defines': [ 'HAVE_CONFIG_H', ], - 'include_dirs': [ - '.', # libevent includes some of its own headers with - # #include <...> instead of #include "..." - ], 'conditions': [ # libevent has platform-specific implementation files. Since its # native build uses autoconf, platform-specific config.h files are |