diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:14 -0500 |
| commit | bb5f99d4dfe119f82556ba4d9385d667a8414935 (patch) | |
| tree | d293ca6b963b380f3e67952dccdc57be20b96df1 /src/or/cpuworker.c | |
| parent | 40ef9087cf7960ce00cd82aa49309f47c9eb064c (diff) | |
| parent | 9ecf133686c8907baec2292ca612ee11aa18406e (diff) | |
| download | tor-bb5f99d4dfe119f82556ba4d9385d667a8414935.tar.gz tor-bb5f99d4dfe119f82556ba4d9385d667a8414935.zip | |
Merge remote branch 'sebastian/bug2314' into 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 29dfc90012..7cbc191333 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -250,7 +250,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, |