diff options
Diffstat (limited to 'lib/libevent')
| -rw-r--r-- | lib/libevent/Makefile | 11 | ||||
| -rw-r--r-- | lib/libevent/buffer.c | 7 | ||||
| -rw-r--r-- | lib/libevent/evutil.c | 8 | ||||
| -rw-r--r-- | lib/libevent/kqueue.c | 4 | ||||
| -rw-r--r-- | lib/libevent/select.c | 9 | ||||
| -rw-r--r-- | lib/libevent/signal.c | 6 |
6 files changed, 7 insertions, 38 deletions
diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile index 16eb13c1280..0562489e859 100644 --- a/lib/libevent/Makefile +++ b/lib/libevent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2014/10/17 22:59:46 bluhm Exp $ +# $OpenBSD: Makefile,v 1.38 2014/10/18 16:48:28 bluhm Exp $ LIB= event SRCS= buffer.c evbuffer.c event.c event_tagging.c evutil.c kqueue.c \ @@ -58,14 +58,7 @@ MLINKS= event.3 bufferevent_base_set.3 \ event.3 event_asr_run.3 \ event.3 event_asr_abort.3 -CFLAGS+= -I${.CURDIR} -DNDEBUG \ - -DHAVE_FD_MASK \ - -DHAVE_SETFD \ - -DHAVE_STRLCPY \ - -DHAVE_STRSEP \ - -DHAVE_STRTOK_R \ - -DHAVE_STRTOLL \ - -DHAVE_VASPRINTF +CFLAGS+= -I${.CURDIR} -DNDEBUG CDIAGFLAGS= -Wall #CDIAGFLAGS+= -Werror diff --git a/lib/libevent/buffer.c b/lib/libevent/buffer.c index d84b9b19e8b..eb27e5fa249 100644 --- a/lib/libevent/buffer.c +++ b/lib/libevent/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.22 2014/10/17 19:16:01 bluhm Exp $ */ +/* $OpenBSD: buffer.c,v 1.23 2014/10/18 16:48:28 bluhm Exp $ */ /* * Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu> @@ -27,11 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_VASPRINTF -/* If we have vasprintf, we need to define this before we include stdio.h. */ -#define _GNU_SOURCE -#endif - #include <sys/types.h> #include <sys/time.h> #include <sys/ioctl.h> diff --git a/lib/libevent/evutil.c b/lib/libevent/evutil.c index 131da2d459e..4fd3a06baa1 100644 --- a/lib/libevent/evutil.c +++ b/lib/libevent/evutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evutil.c,v 1.7 2014/10/17 20:52:59 bluhm Exp $ */ +/* $OpenBSD: evutil.c,v 1.8 2014/10/18 16:48:28 bluhm Exp $ */ /* * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> @@ -68,13 +68,7 @@ evutil_make_socket_nonblocking(int fd) ev_int64_t evutil_strtoll(const char *s, char **endptr, int base) { -#ifdef HAVE_STRTOLL return (ev_int64_t)strtoll(s, endptr, base); -#elif SIZEOF_LONG == 8 - return (ev_int64_t)strtol(s, endptr, base); -#else -#error "I don't know how to parse 64-bit integers." -#endif } int diff --git a/lib/libevent/kqueue.c b/lib/libevent/kqueue.c index 773f08ab389..7960c0c9146 100644 --- a/lib/libevent/kqueue.c +++ b/lib/libevent/kqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kqueue.c,v 1.31 2014/10/17 19:16:01 bluhm Exp $ */ +/* $OpenBSD: kqueue.c,v 1.32 2014/10/18 16:48:28 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -27,8 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define _GNU_SOURCE 1 - #include <sys/types.h> #include <sys/time.h> #include <sys/queue.h> diff --git a/lib/libevent/select.c b/lib/libevent/select.c index 15109a79fdf..43033c2f981 100644 --- a/lib/libevent/select.c +++ b/lib/libevent/select.c @@ -1,4 +1,4 @@ -/* $OpenBSD: select.c,v 1.20 2014/10/17 19:16:01 bluhm Exp $ */ +/* $OpenBSD: select.c,v 1.21 2014/10/18 16:48:28 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -52,13 +52,6 @@ #define howmany(x, y) (((x)+((y)-1))/(y)) #endif -#ifndef HAVE_FD_MASK -/* This type is mandatory, but Android doesn't define it. */ -#undef NFDBITS -#define NFDBITS (sizeof(long)*8) -typedef unsigned long fd_mask; -#endif - struct selectop { int event_fds; /* Highest fd in fd set */ int event_fdsz; diff --git a/lib/libevent/signal.c b/lib/libevent/signal.c index 32189e139e6..c1e424ea645 100644 --- a/lib/libevent/signal.c +++ b/lib/libevent/signal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.c,v 1.21 2014/10/17 19:16:01 bluhm Exp $ */ +/* $OpenBSD: signal.c,v 1.22 2014/10/18 16:48:28 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -63,14 +63,10 @@ evsignal_cb(int fd, short what, void *arg) event_err(1, "%s: read", __func__); } -#ifdef HAVE_SETFD #define FD_CLOSEONEXEC(x) do { \ if (fcntl(x, F_SETFD, FD_CLOEXEC) == -1) \ event_warn("fcntl(%d, F_SETFD)", x); \ } while (0) -#else -#define FD_CLOSEONEXEC(x) -#endif int evsignal_init(struct event_base *base) |