[Opalvoip-svn] SF.net SVN: opalvoip: [18785] opal/branches/Phobos

[<cso...@us...>]

Revision: 18785
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18785&view=rev
Author:   csoutheren
Date:     2007-11-03 04:39:41 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
Fixed compilation with latest PTLib

Modified Paths:
--------------
    opal/branches/Phobos/include/sip/sippdu.h
    opal/branches/Phobos/src/opal/connection.cxx

Modified: opal/branches/Phobos/include/sip/sippdu.h
===================================================================
--- opal/branches/Phobos/include/sip/sippdu.h	2007-11-02 07:14:36 UTC (rev 18784)
+++ opal/branches/Phobos/include/sip/sippdu.h	2007-11-03 11:39:41 UTC (rev 18785)
@@ -470,7 +470,7 @@
       const PString & password = PString::Empty()
     );
 
-#if PWLIB_MAJOR >= 1 && PWLIB_MINOR >= 11
+#if (PWLIB_MAJOR >= 1 && PWLIB_MINOR >= 11) || defined (PTLIB_MAJOR)
     SIPAuthentication & operator =(const SIPAuthentication & auth)
     {
       isProxy   = auth.isProxy;

Modified: opal/branches/Phobos/src/opal/connection.cxx
===================================================================
--- opal/branches/Phobos/src/opal/connection.cxx	2007-11-02 07:14:36 UTC (rev 18784)
+++ opal/branches/Phobos/src/opal/connection.cxx	2007-11-03 11:39:41 UTC (rev 18785)
@@ -241,6 +241,7 @@
  */
 
 #include <ptlib.h>
+#include <ptbuildopts.h>
 
 #ifdef __GNUC__
 #pragma implementation "connection.h"
@@ -1064,7 +1065,7 @@
   // before the audio is passed on to the sound card (or other output device)
 
   // Pass the 16 bit PCM audio through the DTMF decoder   
-#if PWLIB_MAJOR >= 1 && PWLIB_MINOR >= 11
+#if (PWLIB_MAJOR >= 1 && PWLIB_MINOR >= 11) || defined(PTLIB_MAJOR)
   PString tones = dtmfDecoder.Decode((short *)frame.GetPayloadPtr(), frame.GetPayloadSize()/2);
 #else
   PString tones = dtmfDecoder.Decode(frame.GetPayloadPtr(), frame.GetPayloadSize());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.