diff options
| -rw-r--r-- | lib/libevent/Makefile | 9 | ||||
| -rw-r--r-- | lib/libevent/config.h | 83 | ||||
| -rw-r--r-- | lib/libevent/signal.c | 4 |
3 files changed, 10 insertions, 86 deletions
diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile index 434688c2692..ec9498e4e76 100644 --- a/lib/libevent/Makefile +++ b/lib/libevent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2003/07/09 10:54:37 markus Exp $ +# $OpenBSD: Makefile,v 1.6 2003/07/10 07:48:41 markus Exp $ LIB= event SRCS= event.c select.c signal.c kqueue.c @@ -11,7 +11,12 @@ MLINKS= event.3 event_init.3 event.3 event_dispatch.3 event.3 event_loop.3 \ evtimer_del.3 event.3 evtimer_pending.3 event.3 evtimer_initialized.3 \ event.3 signal_set.3 event.3 signal_add.3 event.3 signal_del.3 \ event.3 signal_pending.3 event.3 signal_initialized.3 -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} + +CFLAGS+= -I${.CURDIR} \ + -DHAVE_WORKING_KQUEUE \ + -DHAVE_SELECT \ + -DHAVE_SYS_TIME_H \ + NOPIC= includes: diff --git a/lib/libevent/config.h b/lib/libevent/config.h deleted file mode 100644 index 0667e356e0c..00000000000 --- a/lib/libevent/config.h +++ /dev/null @@ -1,83 +0,0 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you can safely include both <sys/time.h> and <time.h>. */ -#define TIME_WITH_SYS_TIME 1 - -/* Define if kqueue works correctly with pipes */ -#define HAVE_WORKING_KQUEUE 1 - -/* Define if timeradd is defined in <sys/time.h> */ -#define HAVE_TIMERADD 1 -#ifndef HAVE_TIMERADD -#define timeradd(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) -#define timersub(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ - } while (0) -#endif /* !HAVE_TIMERADD */ - -/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ -#define HAVE_TAILQFOREACH 1 -#ifndef HAVE_TAILQFOREACH -#define TAILQ_FIRST(head) ((head)->tqh_first) -#define TAILQ_END(head) NULL -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) -#define TAILQ_FOREACH(var, head, field) \ - for((var) = TAILQ_FIRST(head); \ - (var) != TAILQ_END(head); \ - (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 */ - -/* Define if you have the gettimeofday function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define if you have the kqueue function. */ -#define HAVE_KQUEUE 1 - -/* Define if you have the select function. */ -#define HAVE_SELECT 1 - -/* Define if you have the warnx function. */ -#define HAVE_WARNX 1 - -/* Define if you have the <sys/event.h> header file. */ -#define HAVE_SYS_EVENT_H 1 - -/* Define if you have the <sys/queue.h> header file. */ -#define HAVE_SYS_QUEUE_H 1 - -/* Define if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Name of package */ -#define PACKAGE "libevent" - -/* Version number of package */ -#define VERSION "0.5" - diff --git a/lib/libevent/signal.c b/lib/libevent/signal.c index e0d96ccf765..f54bf62ff2f 100644 --- a/lib/libevent/signal.c +++ b/lib/libevent/signal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.c,v 1.1 2003/07/09 10:54:38 markus Exp $ */ +/* $OpenBSD: signal.c,v 1.2 2003/07/10 07:48:42 markus Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -29,7 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <sys/types.h> #ifdef HAVE_SYS_TIME_H |