diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-19 15:27:28 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-19 15:27:28 +0000 |
| commit | fe6720da49dc870ef8ede3a1ec6e0697931464ba (patch) | |
| tree | f0e6a5fb31fcbb8e82f5737faa1d79ab63986d8c | |
| parent | 3b6ef01545d491221731c784e5dc6cb8d36009ad (diff) | |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@117083 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/h323/ast_h323.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index e3a2d839d..48b876aab 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -63,6 +63,12 @@ extern "C" { #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 @@ static MyH323EndPoint *endPoint = NULL; /** 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(): PProcess("The NuFone Networks", MyProcess::~MyProcess() { +#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND _timerChangePipe[0] = timerChangePipe[0]; _timerChangePipe[1] = timerChangePipe[1]; +#endif } void MyProcess::Main() @@ -2623,8 +2633,10 @@ void h323_end_process(void) if (localProcess) { delete localProcess; localProcess = NULL; +#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND close(_timerChangePipe[0]); close(_timerChangePipe[1]); +#endif } if (logstream) { PTrace::SetLevel(0); |