Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson
2011-01-03 12:47:58 -05:00
6 changed files with 16 additions and 8 deletions
+1 -1
View File
@@ -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,