diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-15 22:34:45 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-15 22:34:45 +0000 |
| commit | a39c64b683f22e56215d0c9ee0d901a70d81b0a1 (patch) | |
| tree | 034df222cdc02ba8540acfba6f1b0f9f89094211 /lib/libevent | |
| parent | 0150e1111de740b6d703a55bb0f85f064bca39d6 (diff) | |
Remove #ifndef HAVE_TAILQFOREACH containing a private tailq
implementation.
OK nicm@
Diffstat (limited to 'lib/libevent')
| -rw-r--r-- | lib/libevent/Makefile | 3 | ||||
| -rw-r--r-- | lib/libevent/event-internal.h | 18 |
2 files changed, 2 insertions, 19 deletions
diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile index 784bb97dec2..a5b0761ba7e 100644 --- a/lib/libevent/Makefile +++ b/lib/libevent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2014/10/06 21:16:03 bluhm Exp $ +# $OpenBSD: Makefile,v 1.34 2014/10/15 22:34:44 bluhm Exp $ LIB= event SRCS= buffer.c evbuffer.c event.c event_tagging.c evutil.c kqueue.c \ @@ -89,7 +89,6 @@ CFLAGS+= -I${.CURDIR} -DNDEBUG \ -DHAVE_SYS_STAT_H \ -DHAVE_SYS_TIME_H \ -DHAVE_SYS_TYPES_H \ - -DHAVE_TAILQFOREACH \ -DHAVE_UNISTD_H \ -DHAVE_VASPRINTF \ -DHAVE_WORKING_KQUEUE diff --git a/lib/libevent/event-internal.h b/lib/libevent/event-internal.h index 7eb2d9d52be..45e8e03a97b 100644 --- a/lib/libevent/event-internal.h +++ b/lib/libevent/event-internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: event-internal.h,v 1.7 2014/09/13 16:06:36 doug Exp $ */ +/* $OpenBSD: event-internal.h,v 1.8 2014/10/15 22:34:44 bluhm Exp $ */ /* * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> @@ -71,22 +71,6 @@ struct event_base { struct timeval tv_cache; }; -/* Internal use only: Functions that might be missing from <sys/queue.h> */ -#ifndef HAVE_TAILQFOREACH -#define TAILQ_FIRST(head) ((head)->tqh_first) -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) -#define TAILQ_FOREACH(var, head, field) \ - for((var) = TAILQ_FIRST(head); \ - (var) != NULL; \ - (var) = TAILQ_NEXT(var, field)) -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - (elm)->field.tqe_next = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ -} while (0) -#endif /* TAILQ_FOREACH */ - int _evsignal_set_handler(struct event_base *base, int evsignal, void (*fn)(int)); int _evsignal_restore_handler(struct event_base *base, int evsignal); |