diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:33:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:33:04 -0500 |
| commit | d1b40cf2e7bb55d3c421e6eff476330e08ab4750 (patch) | |
| tree | 557d4747579301e39f77e4889e84739793690ca3 /src/or/cpuworker.c | |
| parent | 1772782e425734967981b79be1122017ef606dd0 (diff) | |
| parent | dea0720dadea8f3915901833115726f4ba0d48f4 (diff) | |
| download | tor-d1b40cf2e7bb55d3c421e6eff476330e08ab4750.tar.gz tor-d1b40cf2e7bb55d3c421e6eff476330e08ab4750.zip | |
Merge remote-tracking branch 'public/bug4533_part1'
Conflicts:
src/common/compat.h
Diffstat (limited to 'src/or/cpuworker.c')
| -rw-r--r-- | src/or/cpuworker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index e4460c5981..ed31d358ae 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -329,8 +329,8 @@ spawn_cpuworker(void) return -1; } - tor_assert(fdarray[0] >= 0); - tor_assert(fdarray[1] >= 0); + tor_assert(SOCKET_OK(fdarray[0])); + tor_assert(SOCKET_OK(fdarray[1])); fd = fdarray[0]; spawn_func(cpuworker_main, (void*)fdarray); |