diff options
| author |   bluhm <bluhm@openbsd.org> | 2014-10-17 22:59:46 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2014-10-17 22:59:46 +0000 |
| commit | 1fc96e2c647ee43de5ab8b5762e0a7bac22314fa (patch) | |
| tree | 11d07cd9f0b47c5a526850e83aa5405d33b40805 /lib/libevent | |
| parent | trivial sync of the first sentence of the DESCRIPTION (diff) | |
| download | wireguard-openbsd-1fc96e2c647ee43de5ab8b5762e0a7bac22314fa.tar.xz wireguard-openbsd-1fc96e2c647ee43de5ab8b5762e0a7bac22314fa.zip | |
Remove #ifdef HAVE_backend and remove references to unimplemented
backends.
OK nicm@
Diffstat (limited to 'lib/libevent')
| -rw-r--r-- | lib/libevent/Makefile | 7 | ||||
| -rw-r--r-- | lib/libevent/event.c | 32 |
2 files changed, 3 insertions, 36 deletions
diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile index ceb7088a415..16eb13c1280 100644 --- a/lib/libevent/Makefile +++ b/lib/libevent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2014/10/17 20:52:59 bluhm Exp $ +# $OpenBSD: Makefile,v 1.37 2014/10/17 22:59:46 bluhm Exp $ LIB= event SRCS= buffer.c evbuffer.c event.c event_tagging.c evutil.c kqueue.c \ @@ -60,15 +60,12 @@ MLINKS= event.3 bufferevent_base_set.3 \ CFLAGS+= -I${.CURDIR} -DNDEBUG \ -DHAVE_FD_MASK \ - -DHAVE_POLL \ - -DHAVE_SELECT \ -DHAVE_SETFD \ -DHAVE_STRLCPY \ -DHAVE_STRSEP \ -DHAVE_STRTOK_R \ -DHAVE_STRTOLL \ - -DHAVE_VASPRINTF \ - -DHAVE_WORKING_KQUEUE + -DHAVE_VASPRINTF CDIAGFLAGS= -Wall #CDIAGFLAGS+= -Werror diff --git a/lib/libevent/event.c b/lib/libevent/event.c index 0ad2bbc4733..d07852208f1 100644 --- a/lib/libevent/event.c +++ b/lib/libevent/event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: event.c,v 1.33 2014/10/17 20:52:59 bluhm Exp $ */ +/* $OpenBSD: event.c,v 1.34 2014/10/17 22:59:46 bluhm Exp $ */ /* * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> @@ -48,45 +48,15 @@ #include "evutil.h" #include "log.h" -#ifdef HAVE_EVENT_PORTS -extern const struct eventop evportops; -#endif -#ifdef HAVE_SELECT extern const struct eventop selectops; -#endif -#ifdef HAVE_POLL extern const struct eventop pollops; -#endif -#ifdef HAVE_EPOLL -extern const struct eventop epollops; -#endif -#ifdef HAVE_WORKING_KQUEUE extern const struct eventop kqops; -#endif -#ifdef HAVE_DEVPOLL -extern const struct eventop devpollops; -#endif /* In order of preference */ static const struct eventop *eventops[] = { -#ifdef HAVE_EVENT_PORTS - &evportops, -#endif -#ifdef HAVE_WORKING_KQUEUE &kqops, -#endif -#ifdef HAVE_EPOLL - &epollops, -#endif -#ifdef HAVE_DEVPOLL - &devpollops, -#endif -#ifdef HAVE_POLL &pollops, -#endif -#ifdef HAVE_SELECT &selectops, -#endif NULL }; |