From: Sean Bright <sean@malleable.com>
Date: Sat, 16 Jan 2010 00:59:24 +0000 (+0000)
Subject: Merged revisions 240667 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0758e620c9c3ce10249ae516a88532c761c71d82;p=thirdparty%2Fasterisk.git

Merged revisions 240667 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240667 | seanbright | 2010-01-15 19:54:08 -0500 (Fri, 15 Jan 2010) | 2 lines

  Get MoH building on OpenSolaris.
........


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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index c85cb52afb..a8602f44b4 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -46,6 +46,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <thread.h>
 #endif
 
+#ifdef SOLARIS
+#include <thread.h>
+#endif
+
 #ifdef HAVE_DAHDI
 #include <dahdi/user.h>
 #endif