diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:58 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:58 -0500 |
commit | 394a6bf4cdf91efb49b047e08012e834e04aa1c4 (patch) | |
tree | d2f23622da158496cd4735a87073a11858accf71 /src/or/cpuworker.c | |
parent | 1e295666d9f4116ac8b69788fed34bbde7fc725d (diff) | |
parent | bb5f99d4dfe119f82556ba4d9385d667a8414935 (diff) | |
download | tor-394a6bf4cdf91efb49b047e08012e834e04aa1c4.tar.gz tor-394a6bf4cdf91efb49b047e08012e834e04aa1c4.zip |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/cpuworker.c')
-rw-r--r-- | src/or/cpuworker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index d6fd1217e1..5597cad2a8 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -249,7 +249,7 @@ cpuworker_main(void *data) for (;;) { ssize_t r; - if ((r = recv(fd, &question_type, 1, 0)) != 1) { + if ((r = recv(fd, (void *)&question_type, 1, 0)) != 1) { // log_fn(LOG_ERR,"read type failed. Exiting."); if (r == 0) { log_info(LD_OR, |