diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 19:35:50 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 19:35:50 +0000 |
| commit | 8cb986b936ea0cee5af2dccf467fe1fc5b89414b (patch) | |
| tree | b4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/features.c | |
| parent | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (diff) | |
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137082 f38db490-d61c-443f-a65b-d21fe96a405b
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(); } |