[asterisk-commits] seanbright: branch 1.6.1 r240669 - in /branches/1.6.1: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri Jan 15 18:59:24 2010
New Revision: 240669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240669
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_musiconhold.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_musiconhold.c?view=diff&rev=240669&r1=240668&r2=240669
==============================================================================
--- branches/1.6.1/res/res_musiconhold.c (original)
+++ branches/1.6.1/res/res_musiconhold.c Fri Jan 15 18:59:24 2010
@@ -42,6 +42,10 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/ioctl.h>
+#ifdef SOLARIS
+#include <thread.h>
+#endif
+
 #ifdef SOLARIS
 #include <thread.h>
 #endif