From: Automerge Script <automerge@asterisk.org>
Date: Tue, 23 Jan 2007 02:12:58 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a94d6252096889ad787b98b35a710a3c4ec14dbf;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@51557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 746fa2d061..04e4a39eeb 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();