diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 02:12:58 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 02:12:58 +0000 |
commit | 8fdcedaf4c0cbccecd2292bea63a677f3eaad6c4 (patch) | |
tree | e67ab84c649965dc041dc729da171f80342e898b /res | |
parent | ae3048fa10828dc3277bfc8d3aa040daf2b076b8 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@51557 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 746fa2d06..04e4a39ee 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -45,6 +45,9 @@ #endif #include <unistd.h> #include <sys/ioctl.h> +#ifdef SOLARIS +#include <thread.h> +#endif #include "asterisk.h" @@ -508,6 +511,9 @@ static void *monmp3thread(void *data) } } if (class->pseudofd > -1) { +#ifdef SOLARIS + thr_yield(); +#endif /* Pause some amount of time */ res = read(class->pseudofd, buf, sizeof(buf)); pthread_testcancel(); |