cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-08 03:44:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix event_dlist definition when sys/queue not included

Browse Source 
This header adds TAILQ_HEAD and TAILQ_ENTRY if sys/queue is not included.
There is a similar macro that adds LIST_ENTRY but not LIST_HEAD, even though
LIST_HEAD is used later.

This change pulls in the correct definition (swiped from sys/queue) for
LIST_HEAD and cleans up the one spot where it is used.  The change can be
tested by adding

	#undef LIST_HEAD
	#undef LIST_ENTRY

right before the #ifndef checks and removing

	#define EVENT_DEFINED_LISTENTRY_
	#define EVENT_DEFINED_LISTHEAD_

so that the macros persist later.
This commit is contained in:
Derrick Pallas 2012-11-10 11:22:15 -08:00
parent 64051b903a
commit 81b6209e10
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/event2/event_struct.h
View File

@ -91,7 +91,15 @@ struct { \
struct type *le_next; /* next element */ \
struct type **le_prev; /* address of previous next element */ \
}
#endif /* !TAILQ_ENTRY */
#endif /* !LIST_ENTRY */
#ifndef LIST_HEAD
#define EVENT_DEFINED_LISTHEAD_
#define LIST_HEAD(name, type) \
struct name { \
struct type *lh_first; /* first element */ \
}
#endif /* !LIST_HEAD */
struct event_callback {
TAILQ_ENTRY(event_callback) evcb_active_next;
@ -150,13 +158,15 @@ TAILQ_HEAD (event_list, event);
#undef TAILQ_HEAD
#endif
LIST_HEAD (event_dlist, event);
#ifdef EVENT_DEFINED_LISTENTRY_
#undef LIST_ENTRY
struct event_dlist;
#undef EVENT_DEFINED_LISTENTRY_
#else
LIST_HEAD (event_dlist, event);
#endif /* EVENT_DEFINED_LISTENTRY_ */
#endif
#ifdef EVENT_DEFINED_LISTHEAD_
#undef LIST_HEAD
#endif
#ifdef __cplusplus
}