summaryrefslogtreecommitdiffstats
path: root/third_party/libevent/devpoll.c
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 20:23:54 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 20:23:54 +0000
commit78d4429cef4baac9bcdfc2396ce157016621c416 (patch)
treeca8e34515c63dd682d9b75b9bfc6113fcb0c2dfd /third_party/libevent/devpoll.c
parent9101b6b1b3de0a1e3c59325055707c58748651af (diff)
downloadchromium_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/devpoll.c')
-rw-r--r--third_party/libevent/devpoll.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libevent/devpoll.c b/third_party/libevent/devpoll.c
index 513065e..2d34ae3 100644
--- a/third_party/libevent/devpoll.c
+++ b/third_party/libevent/devpoll.c
@@ -33,7 +33,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
-#include <sys/_time.h>
+#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <sys/devpoll.h>
@@ -75,7 +75,7 @@ static int devpoll_del (void *, struct event *);
static int devpoll_dispatch (struct event_base *, void *, struct timeval *);
static void devpoll_dealloc (struct event_base *, void *);
-struct eventop devpollops = {
+const struct eventop devpollops = {
"devpoll",
devpoll_init,
devpoll_add,
@@ -131,7 +131,7 @@ devpoll_init(struct event_base *base)
struct devpollop *devpollop;
/* Disable devpoll when this environment variable is set */
- if (getenv("EVENT_NODEVPOLL"))
+ if (evutil_getenv("EVENT_NODEVPOLL"))
return (NULL);
if (!(devpollop = calloc(1, sizeof(struct devpollop))))