[asterisk-commits] file: branch 1.6.0 r117083 - in /branches/1.6.0: ./ channels/h323/ast_h323.cxx

[SVN commits to the Asterisk project]

Author: file
Date: Mon May 19 10:27:28 2008
New Revision: 117083

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117083
Log:
Merged revisions 117082 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r117082 | file | 2008-05-19 12:24:44 -0300 (Mon, 19 May 2008) | 14 lines

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

........
r117081 | file | 2008-05-19 12:22:10 -0300 (Mon, 19 May 2008) | 6 lines

Make chan_h323 work with pwlib 1.12.0
(closes issue #12682)
Reported by: bamby
Patches:
      pwlib_nopipe.diff uploaded by bamby (license 430)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/h323/ast_h323.cxx

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

Modified: branches/1.6.0/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/h323/ast_h323.cxx?view=diff&rev=117083&r1=117082&r2=117083
==============================================================================
--- branches/1.6.0/channels/h323/ast_h323.cxx (original)
+++ branches/1.6.0/channels/h323/ast_h323.cxx Mon May 19 10:27:28 2008
@@ -63,6 +63,12 @@
 #include "cisco-h225.h"
 #include "caps_h323.h"
 
+#include <ptbuildopts.h>
+
+#if PWLIB_MAJOR * 10000 + PWLIB_MINOR * 100 + PWLIB_BUILD >= 1 * 10000 + 12 * 100 + 0
+#define SKIP_PWLIB_PIPE_BUG_WORKAROUND 1
+#endif
+
 /* PWlib Required Components  */
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
@@ -82,7 +88,9 @@
 /** PWLib entry point */
 static MyProcess *localProcess = NULL;
 
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
 static int _timerChangePipe[2];
+#endif
 
 static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine;
 
@@ -192,8 +200,10 @@
 
 MyProcess::~MyProcess()
 {
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
 	_timerChangePipe[0] = timerChangePipe[0];
 	_timerChangePipe[1] = timerChangePipe[1];
+#endif
 }
 
 void MyProcess::Main()
@@ -2623,8 +2633,10 @@
 	if (localProcess) {
 		delete localProcess;
 		localProcess = NULL;
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
 		close(_timerChangePipe[0]);
 		close(_timerChangePipe[1]);
+#endif
 	}
 	if (logstream) {
 		PTrace::SetLevel(0);