r15549@tombo: nickm | 2008-05-08 11:53:11 -0400

Make new http headers include minimal parts of event2/ tree; make old evhttp.h incldue event.h, since the old one did too.


svn:r798

evhttp.h

@@ -27,6 +27,7 @@
 #ifndef _EVHTTP_H_
 #define _EVHTTP_H_
 
+#include <event.h>
 #include <event2/http.h>
 #include <event2/http_struct.h>
 #include <event2/http_compat.h>

evrpc.c

@@ -58,6 +58,8 @@
 #include "evrpc.h"
 #include "evrpc-internal.h"
 #include "event2/http.h"
+#include "event2/buffer.h"
+#include "event2/tag.h"
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
 #include "evutil.h"

evrpc.h

@@ -31,6 +31,8 @@
 extern "C" {
 #endif
 
+#include <event2/event_struct.h>
+
 /** @file evrpc.h
  *
  * This header files provides basic support for an RPC server and client.

http-internal.h

@@ -7,8 +7,10 @@
  * need to know about these.
  */
 
-#ifndef _HTTP_H_
-#define _HTTP_H_
+#ifndef _HTTP_INTERNAL_H_
+#define _HTTP_INTERNAL_H_
+
+#include "event2/event_struct.h"
 
 #define HTTP_CONNECT_TIMEOUT	45
 #define HTTP_WRITE_TIMEOUT	50

http.c

@@ -88,11 +88,13 @@
 #undef timeout_initialized
 
 #include "strlcpy-internal.h"
-#include "event2/event.h"
 #include "event2/http.h"
+#include "event2/event.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent.h"
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
-#include "evutil.h"
+#include "event2/util.h"
 #include "log.h"
 #include "http-internal.h"
 #include "mm-internal.h"

include/event2/http.h

@@ -27,9 +27,8 @@
 #ifndef _EVENT2_HTTP_H_
 #define _EVENT2_HTTP_H_
 
-#include <event2/http.h>
-#include <event2/http_struct.h>
-#include <event2/http_compat.h>
+/* For int types. */
+#include <event2/util.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,8 +41,9 @@ extern "C" {
 #undef WIN32_LEAN_AND_MEAN
 #endif
 
-/* For int types. */
-#include <evutil.h>
+/* In case we haven't included the right headers yet. */
+struct evbuffer;
+struct event_base;
 
 /** @file evhttp.h
  *