diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp index bc21a2ff47b0ed23740c9cc8f734eafea445a70b..bd1afcda1a7caebc64c00e59373b00b61a6844a4 100644 --- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp +++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp @@ -299,7 +299,7 @@ void AudioRtpFactory::updateDestinationIpAddress (void) sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession() { - if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != NULL)) { + if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != 0)) { return static_cast<AudioSymmetricRtpSession *> (_rtpSession); } else { throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioSymetricRtpSession"); @@ -308,7 +308,7 @@ sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession() sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession() { - if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != NULL)) { + if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != 0)) { return static_cast<AudioZrtpSession *> (_rtpSession); } else { throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioZrtpSession"); diff --git a/sflphone-common/src/call.h b/sflphone-common/src/call.h index f566774c2c299e88ebdcf9c16fe0ed6d6894963d..698cfd862ef4867d12fa5488a4a14de364cb1dfe 100644 --- a/sflphone-common/src/call.h +++ b/sflphone-common/src/call.h @@ -40,7 +40,7 @@ #define SIP_SCHEME "sip:" #define SIPS_SCHEME "sips:" -#define CallConfigNULL NULL +#define CallConfigNULL 0 /* * @file call.h diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp index fac27823de13bd1d0b1ba38fd9c20196e15f9f62..da2c6b2daa2ea65ff62d227325151c2d08778d91 100644 --- a/sflphone-common/src/iax/iaxvoiplink.cpp +++ b/sflphone-common/src/iax/iaxvoiplink.cpp @@ -62,7 +62,7 @@ IAXVoIPLink::IAXVoIPLink (const AccountID& accountID) : VoIPLink (accountID) , spkrDataDecoded (NULL) , spkrDataConverted (NULL) , converter (NULL) - , converterSamplingRate (NULL) + , converterSamplingRate (0) , urlhook (NULL) { _evThread = new EventThread (this);