[tor-commits] [tor/maint-0.2.2] Unbreak the build on libevent 1.x systems

[nickm@xxxxxxxxxxxxxx]

commit 6cac100b13794b74db8e831bed56df2f0443ea13
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Sun May 22 22:54:02 2011 -0700

    Unbreak the build on libevent 1.x systems
---
 src/common/procmon.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/common/procmon.c b/src/common/procmon.c
index bd25bc1..8fcc1af 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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits