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/caps_h323.cxx | |
| 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/caps_h323.cxx')
| -rw-r--r-- | channels/h323/caps_h323.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/h323/caps_h323.cxx b/channels/h323/caps_h323.cxx index ebb90f3f2..3f7230f65 100644 --- a/channels/h323/caps_h323.cxx +++ b/channels/h323/caps_h323.cxx @@ -159,7 +159,7 @@ H323Codec * AST_G711Capability::CreateCodec(H323Codec::Direction direction) cons /* * Capability: G.723.1 */ -AST_G7231Capability::AST_G7231Capability(int rx_frames, BOOL annexA_) +AST_G7231Capability::AST_G7231Capability(int rx_frames, PBoolean annexA_) : H323AudioCapability(rx_frames, 4) { annexA = annexA_; @@ -196,7 +196,7 @@ unsigned AST_G7231Capability::GetSubType() const return H245_AudioCapability::e_g7231; } -BOOL AST_G7231Capability::OnSendingPDU(H245_AudioCapability & cap, +PBoolean AST_G7231Capability::OnSendingPDU(H245_AudioCapability & cap, unsigned packetSize) const { cap.SetTag(H245_AudioCapability::e_g7231); @@ -206,7 +206,7 @@ BOOL AST_G7231Capability::OnSendingPDU(H245_AudioCapability & cap, return TRUE; } -BOOL AST_G7231Capability::OnReceivedPDU(const H245_AudioCapability & cap, +PBoolean AST_G7231Capability::OnReceivedPDU(const H245_AudioCapability & cap, unsigned & packetSize) { if (cap.GetTag() != H245_AudioCapability::e_g7231) { @@ -299,7 +299,7 @@ unsigned AST_GSM0610Capability::GetSubType() const return H245_AudioCapability::e_gsmFullRate; } -BOOL AST_GSM0610Capability::OnSendingPDU(H245_AudioCapability & cap, +PBoolean AST_GSM0610Capability::OnSendingPDU(H245_AudioCapability & cap, unsigned packetSize) const { cap.SetTag(H245_AudioCapability::e_gsmFullRate); @@ -310,7 +310,7 @@ BOOL AST_GSM0610Capability::OnSendingPDU(H245_AudioCapability & cap, return TRUE; } -BOOL AST_GSM0610Capability::OnReceivedPDU(const H245_AudioCapability & cap, +PBoolean AST_GSM0610Capability::OnReceivedPDU(const H245_AudioCapability & cap, unsigned & packetSize) { if (cap.GetTag() != H245_AudioCapability::e_gsmFullRate) |