diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 02:16:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 02:16:25 -0400 |
| commit | 6f200b61b7effe811809fe60459b0b5b58cb3dbb (patch) | |
| tree | 1cf2d2abe74228ee7af8df9f275bac0abc53a5d8 | |
| parent | 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 (diff) | |
| parent | 6cac100b13794b74db8e831bed56df2f0443ea13 (diff) | |
| download | tor-6f200b61b7effe811809fe60459b0b5b58cb3dbb.tar tor-6f200b61b7effe811809fe60459b0b5b58cb3dbb.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | 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 bd25bc10e..8fcc1afb7 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 |