aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-10 11:08:23 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-10 11:08:49 -0400
commit5dab99d6a81480278044dfbc1e51e7b7c3cc19e4 (patch)
treeb570ac61fffa8fc9ae079fb7acf278a7d45b9225 /src
parent95fa7d1cf82c68d7d39f423cf71fa8e097662de3 (diff)
downloadtor-5dab99d6a81480278044dfbc1e51e7b7c3cc19e4.tar.gz
tor-5dab99d6a81480278044dfbc1e51e7b7c3cc19e4.zip
Fix compilation on libevent2-only systems
Patch from rubiate; fixes bug 22219. Remember, we don't support libevent1 any more.
Diffstat (limited to 'src')
-rw-r--r--src/or/channelpadding.c2
-rw-r--r--src/test/test_channelpadding.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 4121651562..f5248e8960 100644
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -20,7 +20,7 @@
#include "rephist.h"
#include "router.h"
#include "compat_time.h"
-#include <event.h>
+#include <event2/event.h>
STATIC int channelpadding_get_netflow_inactive_timeout_ms(const channel_t *);
STATIC int channelpadding_send_disable_command(channel_t *);
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index ba9769444e..ae6abe4bcd 100644
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -11,7 +11,7 @@
#include "channelpadding.h"
#include "compat_libevent.h"
#include "config.h"
-#include <event.h>
+#include <event2/event.h>
#include "compat_time.h"
#include "main.h"
#include "networkstatus.h"