[asterisk-commits] jpeeler: branch 1.6.2 r183031 - in /branches/1.6.2: ./ channels/h323/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Mar 18 16:19:47 2009
New Revision: 183031

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

........
  r183028 | jpeeler | 2009-03-18 16:18:27 -0500 (Wed, 18 Mar 2009) | 4 lines
  
  Add some code removed by mistake from commit 182722 that works around a file
  descriptor leak in versions of PWLib prior to 1.12.0.
........

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar 18 16:19:47 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028

Modified: branches/1.6.2/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/channels/h323/ast_h323.cxx?view=diff&rev=183031&r1=183030&r2=183031
==============================================================================
--- branches/1.6.2/channels/h323/ast_h323.cxx (original)
+++ branches/1.6.2/channels/h323/ast_h323.cxx Wed Mar 18 16:19:47 2009
@@ -88,7 +88,8 @@
 #include "cisco-h225.h"
 #include "caps_h323.h"
 
-#if VERSION(PWLIB_MAJOR, PWLIB_MINOR, PWLIB_BUILD) >= VERSION(1,12,0)
+/* PWLIB_MAJOR renamed to PTLIB_MAJOR in 2.x.x */
+#if (defined(PTLIB_MAJOR) || VERSION(PWLIB_MAJOR, PWLIB_MINOR, PWLIB_BUILD) >= VERSION(1,12,0))
 #define SKIP_PWLIB_PIPE_BUG_WORKAROUND 1
 #endif
 
@@ -132,6 +133,10 @@
  * FIXME: Singleton this, for safety
  */
 static MyH323EndPoint *endPoint = NULL;
+
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
+static int _timerChangePipe[2];
+#endif
 
 static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine;
 
@@ -2670,6 +2675,10 @@
 		delete endPoint;
 		endPoint = NULL;
 	}
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
+	close(_timerChangePipe[0]);
+	close(_timerChangePipe[1]);
+#endif
 	if (logstream) {
 		delete logstream;
 		logstream = NULL;