diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 20:23:54 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 20:23:54 +0000 |
| commit | 78d4429cef4baac9bcdfc2396ce157016621c416 (patch) | |
| tree | ca8e34515c63dd682d9b75b9bfc6113fcb0c2dfd /third_party/libevent/event.h | |
| parent | 9101b6b1b3de0a1e3c59325055707c58748651af (diff) | |
| download | chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.zip chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.tar.gz chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.tar.bz2 | |
posix: upgrade libevent from 1.4.7 to 1.4.13
I took this opportunity to rejigger how we hacked around using an uninstalled
libevent, to remove a TODO that mentioned danger in the README.
Files to review: README.chromium and chromium.patch.
The rest are probably rubber-stampable.
Review URL: http://codereview.chromium.org/412006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libevent/event.h')
| -rw-r--r-- | third_party/libevent/event.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/libevent/event.h b/third_party/libevent/event.h index f94675f..72e9b8b 100644 --- a/third_party/libevent/event.h +++ b/third_party/libevent/event.h @@ -209,6 +209,7 @@ struct { \ #endif /* !TAILQ_ENTRY */ struct event_base; +#ifndef EVENT_NO_STRUCT struct event { TAILQ_ENTRY (event) ev_next; TAILQ_ENTRY (event) ev_active_next; @@ -232,6 +233,9 @@ struct event { int ev_res; /* result passed to event callback */ int ev_flags; }; +#else +struct event; +#endif #define EVENT_SIGNAL(ev) (int)(ev)->ev_fd #define EVENT_FD(ev) (int)(ev)->ev_fd @@ -747,6 +751,7 @@ struct event_watermark { size_t high; }; +#ifndef EVENT_NO_STRUCT struct bufferevent { struct event_base *ev_base; @@ -769,7 +774,7 @@ struct bufferevent { short enabled; /* events that are currently enabled */ }; - +#endif /** Create a new bufferevent. @@ -1069,7 +1074,6 @@ int evbuffer_add_vprintf(struct evbuffer *, const char *fmt, va_list ap); @param buf the evbuffer to be drained @param len the number of bytes to drain from the beginning of the buffer - @return 0 if successful, or -1 if an error occurred */ void evbuffer_drain(struct evbuffer *, size_t); |