diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
| commit | b69c8e6ab5b5d20a964d67e93cda8dc07da61fa4 (patch) | |
| tree | b4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/features.c | |
| parent | 3ffb39833b25a02108214d7584733bc6b9c334df (diff) | |
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 308c4f60d..b1536837c 100644 --- a/main/features.c +++ b/main/features.c @@ -2567,9 +2567,9 @@ static void *do_parking_thread(void *ignore) rfds = nrfds; efds = nefds; { - struct timeval tv = ast_samp2tv(ms, 1000); + struct timeval wait = ast_samp2tv(ms, 1000); /* Wait for something to happen */ - ast_select(max + 1, &rfds, NULL, &efds, (ms > -1) ? &tv : NULL); + ast_select(max + 1, &rfds, NULL, &efds, (ms > -1) ? &wait : NULL); } pthread_testcancel(); } |