summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2014-10-31 16:00:44 +0000
committerbluhm <bluhm@openbsd.org>2014-10-31 16:00:44 +0000
commitd3b83b610c19369dc122892b652750450ccf42b4 (patch)
tree05f86160cec5d981a517149f4bcdd92ae651b9ea
parentUse "const char tempchars[]" instead of "const char *tempchars". (diff)
downloadwireguard-openbsd-d3b83b610c19369dc122892b652750450ccf42b4.tar.xz
wireguard-openbsd-d3b83b610c19369dc122892b652750450ccf42b4.zip
Libevent has compatibilty wrappers in evutil. OpenBSD does not use
them anymore, but evutil is still part of libevent's interface. Separate the API of evutil from libevent and do not include evutil.h from event.h automatically. A version bump is not necessary as the library itself does not change. Bulk ports build done by landry@ had no fallout. OK nicm@ deraadt@
-rw-r--r--lib/libevent/event.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libevent/event.h b/lib/libevent/event.h
index ba69f9101b3..33b9f7b669a 100644
--- a/lib/libevent/event.h
+++ b/lib/libevent/event.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: event.h,v 1.28 2014/10/30 16:45:37 bluhm Exp $ */
+/* $OpenBSD: event.h,v 1.29 2014/10/31 16:00:44 bluhm Exp $ */
/*
* Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
@@ -168,8 +168,11 @@ extern "C" {
#include <stdarg.h>
#include <stdint.h>
-/* For int types. */
-#include <evutil.h>
+#define ev_uint64_t uint64_t
+#define ev_int64_t int64_t
+#define ev_uint32_t uint32_t
+#define ev_uint16_t uint16_t
+#define ev_uint8_t uint8_t
#define EVLIST_TIMEOUT 0x01
#define EVLIST_INSERTED 0x02