diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-18 20:15:37 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-18 20:15:37 +0000 |
| commit | 27e82e2ee03e30aa120d18e457a41ebfb3398e16 (patch) | |
| tree | 4fec9b1815a3d73cc8458ce4216b8b3e7938d3a7 /channels/h323/cisco-h225.h | |
| parent | 93675cf7dfcd7c9e1f0305ca4c1453855c7984ea (diff) | |
Merged revisions 177162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r177162 | jpeeler | 2009-02-18 14:11:57 -0600 (Wed, 18 Feb 2009) | 14 lines
Modify h323 to build against PTLib as well as the older PWLib
Several changes in PTLib have occurred requiring build time detection. Changes
accounted for include the library name change, config option change, install
location change, and a boolean type change which is handled by ast_ptlib.h.
Also, the sed check has been modified to properly work with autoconf >= 2.62.
(closes issue #14224)
Reported by: bergolth
Patches:
asterisk-autoconf-sed.patch uploaded by bergolth (license 661)
asterisk-pwlib-v3.patch uploaded by bergolth (license 661)
Tested by: jpeeler
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@177163 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323/cisco-h225.h')
| -rw-r--r-- | channels/h323/cisco-h225.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/channels/h323/cisco-h225.h b/channels/h323/cisco-h225.h index 7595b4b65..55ed47e3e 100644 --- a/channels/h323/cisco-h225.h +++ b/channels/h323/cisco-h225.h @@ -14,6 +14,7 @@ #endif #include <ptclib/asner.h> +#include "ast_ptlib.h" // // RedirectIEinfo @@ -30,7 +31,7 @@ class CISCO_H225_RedirectIEinfo : public PASN_Sequence PASN_OctetString m_redirectIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -55,7 +56,7 @@ class CISCO_H225_ProgIndIEinfo : public PASN_Sequence PASN_OctetString m_progIndIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -81,7 +82,7 @@ class CISCO_H225_QsigNonStdInfo : public PASN_Sequence PASN_OctetString m_rawMesg; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -107,7 +108,7 @@ class CISCO_H225_CallMgrParam : public PASN_Sequence PASN_OctetString m_enterpriseID; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -132,7 +133,7 @@ class CISCO_H225_CallPreserveParam : public PASN_Sequence PASN_Boolean m_callPreserveIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -161,7 +162,7 @@ class CISCO_H225_CallSignallingParam : public PASN_Sequence PASN_OctetString m_connectedNumber; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -186,7 +187,7 @@ class CISCO_H225_CommonParam : public PASN_Sequence CISCO_H225_RedirectIEinfo m_redirectIEinfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -211,7 +212,7 @@ class CISCO_H225_ProgIndParam : public PASN_Sequence CISCO_H225_ProgIndIEinfo m_progIndIEinfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -236,7 +237,7 @@ class CISCO_H225_ProtoParam : public PASN_Sequence CISCO_H225_QsigNonStdInfo m_qsigNonStdInfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -281,7 +282,7 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence CISCO_H225_CallPreserveParam m_callPreserveParam; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; |