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.
........

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

diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index 30ff0c5b1c9060da7908ff147a63e051fa3083bf..f32398dd73ebef48215feebd0c81baeac767de97 100644 (file)
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -87,7 +87,8 @@ extern "C" {
 #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 @@ static int channelsOpen;
  */
 static MyH323EndPoint *endPoint = NULL;
 
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
+static int _timerChangePipe[2];
+#endif
+
 static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine;
 
 class PAsteriskLog : public PObject, public iostream {
@@ -2669,6 +2674,10 @@ void h323_end_process(void)
                delete endPoint;
                endPoint = NULL;
        }
+#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND
+       close(_timerChangePipe[0]);
+       close(_timerChangePipe[1]);
+#endif
        if (logstream) {
                delete logstream;
                logstream = NULL;