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
This commit is contained in:
Sean Bright
2008-08-10 19:35:50 +00:00
parent 3ffb39833b
commit b69c8e6ab5
22 changed files with 372 additions and 372 deletions

View File

@@ -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();
}