r14732@tombo: nickm | 2007-11-05 22:03:28 -0500

 Quick hack to make evhttp.h build when there is no TAILQ to be found.  Based on patch from Paul Fisher.  We could perhaps do this more elegantly, but it _does_ need to be done.

svn:r475

diff --git a/ChangeLog b/ChangeLog
index 36dfa064ba0bcb45d56a0afede62dc882fe1a37f..4e4f6ada161a03af23c8ad7a934ca703adbd660f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,4 +34,4 @@ Changes in current version:
  o associate an event base with an rpc pool
  o added two additional libraries: libevent_core and libevent_extra in addition to the regular libevent.  libevent_core contains only the event core whereas libevent_extra contains dns, http and rpc support
  o Begin using libtool's library versioning support correctly.  If we don't mess up, this will more or less guarantee binaries linked against old versions of libevent continue working when we make changes to libevent that do not break backward compatibility.
-
+ o Fix evhttp.h compilation when TAILQ_ENTRY is not defined.

diff --git a/evhttp.h b/evhttp.h
index fe16c6f51f4e93c017c1341bd9ccde98b0b2aed7..106ac231e1974635a2d059fe4a195f223f2a058f 100644 (file)
--- a/evhttp.h
+++ b/evhttp.h
@@ -166,7 +166,14 @@ enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE };
  * reasonable accessors.
  */
 struct evhttp_request {
+#if defined(TAILQ_ENTRY)
        TAILQ_ENTRY(evhttp_request) next;
+#else
+struct {
+       struct evhttp_request *tqe_next;
+       struct evhttp_request **tqe_prev;
+}       next;
+#endif
 
        /* the connection object that this request belongs to */
        struct evhttp_connection *evcon;