[svn-commits] russell: branch 1.6.0 r716 - in /branches/1.6.0: ./ channels/ooh323c/src/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 22 11:00:29 2008
New Revision: 716

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=716
Log:
Merged revisions 715 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

................
r715 | russell | 2008-12-22 11:00:07 -0600 (Mon, 22 Dec 2008) | 15 lines

Merged revisions 714 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r714 | russell | 2008-12-22 10:59:46 -0600 (Mon, 22 Dec 2008) | 7 lines

Fix a bogus pthread_mutex_init()

(closes issue #14116)
Reported by: junky
Patches:
      mutex_init.diff uploaded by junky (license 177)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/ooh323c/src/ooCmdChannel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Dec 22 11:00:29 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707,715

Modified: branches/1.6.0/channels/ooh323c/src/ooCmdChannel.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/channels/ooh323c/src/ooCmdChannel.c?view=diff&rev=716&r1=715&r2=716
==============================================================================
--- branches/1.6.0/channels/ooh323c/src/ooCmdChannel.c (original)
+++ branches/1.6.0/channels/ooh323c/src/ooCmdChannel.c Mon Dec 22 11:00:29 2008
@@ -37,7 +37,7 @@
    if ((ret = pipe(thePipe)) == -1) {
       return OO_FAILED;
    }
-   pthread_mutex_init(&gCmdChanLock);
+   pthread_mutex_init(&gCmdChanLock, NULL);
 
    gH323ep.cmdSock = dup(thePipe[0]);
    close(thePipe[0]);