summaryrefslogtreecommitdiffstats
path: root/third_party/libevent
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libevent')
-rw-r--r--third_party/libevent/chromium.patch13
-rw-r--r--third_party/libevent/evdns.c2
-rw-r--r--third_party/libevent/evhttp.h2
-rw-r--r--third_party/libevent/libevent.gyp4
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