From: Robert Ransom <rransom.8774@gmail.com>
Date: Mon, 23 May 2011 05:54:02 +0000 (-0700)
Subject: Unbreak the build on libevent 1.x systems
X-Git-Tag: tor-0.2.3.2-alpha~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cac100b13794b74db8e831bed56df2f0443ea13;p=thirdparty%2Ftor.git

Unbreak the build on libevent 1.x systems
---

diff --git a/src/common/procmon.c b/src/common/procmon.c
index bd25bc10e3..8fcc1afb7c 100644
--- a/src/common/procmon.c
+++ b/src/common/procmon.c
@@ -152,7 +152,11 @@ tor_validate_process_specifier(const char *process_spec,
 #define PERIODIC_TIMER_FLAGS (0)
 #endif
 
-static const struct timeval poll_interval_tv = {15, 0};
+static struct timeval poll_interval_tv = {15, 0};
+/* Note: If you port this file to plain Libevent 2, you can make
+ * poll_interval_tv const.  It has to be non-const here because in
+ * libevent 1.x, event_add expects a pointer to a non-const struct
+ * timeval. */
 
 /** Create a process-termination monitor for the process specifier
  * given in <b>process_spec</b>.  Return a newly allocated