From 4e8a339ef7afaecaa230ef4acd68c87c78f51e96 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 May 2008 15:46:00 +0000
Subject: [PATCH]  r19602@catbus:  nickm | 2008-05-05 11:45:18 -0400  Make most
 of the tests use the new headers.

svn:r776
---
 test/regress.c         | 10 ++++++++--
 test/regress_dns.c     |  3 ++-
 test/regress_pthread.c |  5 +++--
 test/regress_rpc.c     |  2 +-
 test/regress_zlib.c    | 11 +++++++----
 test/test-time.c       |  4 +++-
 test/test-weof.c       |  6 ++++--
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/test/regress.c b/test/regress.c
index a7321835..63eee8a2 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -55,8 +55,14 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "event.h"
-#include "evutil.h"
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/event_compat.h"
+#include "event2/tag.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/util.h"
 #include "event-internal.h"
 #include "evbuffer-internal.h"
 #include "log.h"
diff --git a/test/regress_dns.c b/test/regress_dns.c
index 8191192c..a4b08e53 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -59,7 +59,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "event.h"
+#include "event2/event.h"
+#include "event2/event_compat.h"
 #include "evdns.h"
 #include "log.h"
 
diff --git a/test/regress_pthread.c b/test/regress_pthread.c
index 6e43ae7c..ea97fc7f 100644
--- a/test/regress_pthread.c
+++ b/test/regress_pthread.c
@@ -36,8 +36,9 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include "evutil.h"
-#include "event.h"
+#include "event2/util.h"
+#include "event2/event.h"
+#include "event2/event_struct.h"
 #include "event2/thread.h"
 
 void regress_pthread(void);
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index bd8324b9..d256725e 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -53,7 +53,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "event.h"
+#include "event2/event.h"
 #include "evhttp.h"
 #include "log.h"
 #include "evrpc.h"
diff --git a/test/regress_zlib.c b/test/regress_zlib.c
index 48bea35d..49bd053b 100644
--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@@ -49,8 +49,11 @@
 #include <zlib.h>
 #include <assert.h>
 
-#include "evutil.h"
-#include "event.h"
+#include "event2/util.h"
+#include "event2/event.h"
+#include "event2/event_compat.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent.h"
 
 void regress_zlib(void);
 
@@ -175,7 +178,7 @@ zlib_output_filter(struct evbuffer *src, struct evbuffer *dst,
 static void
 readcb(struct bufferevent *bev, void *arg)
 {
-	if (EVBUFFER_LENGTH(bev->input) == 8333) {
+	if (EVBUFFER_LENGTH(bufferevent_input(bev)) == 8333) {
 		struct evbuffer *evbuf = evbuffer_new();
 		assert(evbuf != NULL);
 
@@ -194,7 +197,7 @@ readcb(struct bufferevent *bev, void *arg)
 static void
 writecb(struct bufferevent *bev, void *arg)
 {
-	if (EVBUFFER_LENGTH(bev->output) == 0)
+	if (EVBUFFER_LENGTH(bufferevent_output(bev)) == 0)
 		test_ok++;
 }
 
diff --git a/test/test-time.c b/test/test-time.c
index a847d55e..b44a6370 100644
--- a/test/test-time.c
+++ b/test/test-time.c
@@ -17,7 +17,9 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <event.h>
+#include <event2/event.h>
+#include <event2/event_compat.h>
+#include <event2/event_struct.h>
 
 int called = 0;
 
diff --git a/test/test-weof.c b/test/test-weof.c
index 5d87ceb8..91982656 100644
--- a/test/test-weof.c
+++ b/test/test-weof.c
@@ -24,8 +24,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <event.h>
-#include <evutil.h>
+#include <event2/event.h>
+#include <event2/event_struct.h>
+#include <event2/event_compat.h>
+#include <event2/util.h>
 
 int pair[2];
 int test_okay = 1;