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 746fa2d061326a58fd7df52a09d1c6d93cc899ed..04e4a39eebc10643a6ebd84bc6405df75e88aece 100644 (file)
--- 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();