Merge branch '21_eventlist_v3_squashed'

2 files changed, 12 insertions, 0 deletions

diff --git a/include/event2/event.h b/include/event2/event.h
index a09e3a76..6387dc7b 100644
--- a/include/event2/event.h
+++ b/include/event2/event.h
@@ -1239,6 +1239,16 @@ void event_set_mem_functions(
 #define EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
 #endif
 
+/**
+   Writes a human-readable description of all inserted and/or active
+   events to a provided stdio stream.
+
+   This is intended for debugging; its format is not guaranteed to be the same
+   between libevent versions.
+
+   @param base An event_base on which to scan the events.
+   @param output A stdio file to write on.
+ */
 void event_base_dump_events(struct event_base *, FILE *);
 
 /** Sets 'tv' to the current time (as returned by gettimeofday()),
diff --git a/include/event2/event_struct.h b/include/event2/event_struct.h
index aa93ae7d..d3ca44d4 100644
--- a/include/event2/event_struct.h
+++ b/include/event2/event_struct.h
@@ -96,7 +96,9 @@ struct {								\
 struct event_base;
 struct event {
 	TAILQ_ENTRY(event) ev_active_next;
+#ifdef _EVENT_USE_EVENTLIST
 	TAILQ_ENTRY(event) ev_next;
+#endif
 	/* for managing timeouts */
 	union {
 		TAILQ_ENTRY(event) ev_next_with_common_timeout;