summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2009-02-06 20:20:36 +0000
committerHenri Herscher <henri@oreka.org>2009-02-06 20:20:36 +0000
commit17ab3f85e56d2ee715ad5207f76337f5565e865d (patch)
tree9969d9535107427a54fdbb126f89db90fa2a891a
parent26ef8163e7c212000bddb1d87a2629c6a6392fea (diff)
Fixed x86_64 orkaudio compilation error.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@603 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r--orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp4
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIp.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
index 1e25a2a..f3462a3 100644
--- a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
+++ b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
@@ -154,7 +154,7 @@ bool SkinnyValidateCallInfo(SkCallInfoStruct* sci, u_char* packetEnd)
bool SkinnyValidateCcm5CallInfo(SkCcm5CallInfoStruct *sci, u_char* packetEnd)
{
- int partiesLen = 0;
+ long partiesLen = 0;
bool valid = true;
if(((u_char*)sci + sizeof(SkCcm5CallInfoStruct)) > packetEnd)
{
@@ -164,7 +164,7 @@ bool SkinnyValidateCcm5CallInfo(SkCcm5CallInfoStruct *sci, u_char* packetEnd)
{
valid = false;
}
- partiesLen = (int)packetEnd - (int)sci - sizeof(SkCcm5CallInfoStruct);
+ partiesLen = (long)packetEnd - (long)sci - sizeof(SkCcm5CallInfoStruct);
if(valid)
{
valid = checkPartyString(sci->parties, partiesLen);
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
index d50a039..bf23eba 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
@@ -2362,10 +2362,10 @@ void HandleSkinnyMessage(SkinnyHeaderStruct* skinnyHeader, IpHeaderStruct* ipHea
{
// Extract Calling and Called number.
CStdString callingParty;
- int partiesLen = 0;
+ long partiesLen = 0;
char* parties = (char*)(&ccm5CallInfo->parties);
- partiesLen = (int)packetEnd - (int)ccm5CallInfo - sizeof(SkCcm5CallInfoStruct);
+ partiesLen = (long)packetEnd - (long)ccm5CallInfo - sizeof(SkCcm5CallInfoStruct);
GrabToken(parties, parties+partiesLen, callingParty);
CStdString calledParty;
GrabToken(parties+callingParty.size()+1, parties+partiesLen, calledParty);