On Mon, 23 May 2011 05:18:07 +0000 (UTC) nickm@torproject.org wrote:

commit 1e69c60dccc358a7146c2b5e7825ea729498b41b Author: Nick Mathewson nickm@torproject.org Date: Mon May 23 01:12:00 2011 -0400

The first argument for a libevent callback should be evutil_socket_t

---

src/common/procmon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/procmon.c b/src/common/procmon.c index cee956a..bd25bc1 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -34,7 +34,7 @@ typedef int pid_t; /* Currently we need to poll in some way on all systems. */

#ifdef PROCMON_POLLS -static void tor_process_monitor_poll_cb(int unused1, short unused2, +static void tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, void *procmon_);

This will break the build on libevent 1.x systems (until you merge your bug3270 branch that #defines evutil_socket_t on such systems).

Robert Ransom