summaryrefslogtreecommitdiff
path: root/src/or/control.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-20 18:42:20 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-20 18:42:20 -0400
commitb58dfba76f2d34d8401130137705f2ab1f9bf8c9 (patch)
treeb5d19591d0437307cb7d2b5eba2f5ab474e1fdd0 /src/or/control.h
parent428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7 (diff)
downloadtor-b58dfba76f2d34d8401130137705f2ab1f9bf8c9.tar.gz
tor-b58dfba76f2d34d8401130137705f2ab1f9bf8c9.zip
Rename EVENT_SIGNAL -> EVENT_GOT_SIGNAL
This avoids a conflict with a macro decl from libevent 1.x. Fixes bug 16867; bug not in any released Tor.
Diffstat (limited to 'src/or/control.h')
-rw-r--r--src/or/control.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.h b/src/or/control.h
index 574dd85002..fdf7903cb8 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -176,7 +176,7 @@ void control_free_all(void);
#define EVENT_CLIENTS_SEEN 0x0015
#define EVENT_NEWCONSENSUS 0x0016
#define EVENT_BUILDTIMEOUT_SET 0x0017
-#define EVENT_SIGNAL 0x0018
+#define EVENT_GOT_SIGNAL 0x0018
#define EVENT_CONF_CHANGED 0x0019
#define EVENT_CONN_BW 0x001A
#define EVENT_CELL_STATS 0x001B