[tor-commits] [tor/master] Fix compilation on libevent2-only systems

[nickm at torproject.org]

commit 5dab99d6a81480278044dfbc1e51e7b7c3cc19e4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 11:08:23 2017 -0400

    Fix compilation on libevent2-only systems
    
    Patch from rubiate; fixes bug 22219.  Remember, we don't support
    libevent1 any more.
---
 src/or/channelpadding.c        | 2 +-
 src/test/test_channelpadding.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 4121651..f5248e8 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 ba97694..ae6abe4 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"