Commit d61a2b07 authored by Tristan Matthews's avatar Tristan Matthews

* #5950: remove "converting to non-pointer type 'int' from NULL" warnings

This consists of using 0 instead of NULL where necessary
parent 5abf12c0
......@@ -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");
......
......@@ -40,7 +40,7 @@
#define SIP_SCHEME "sip:"
#define SIPS_SCHEME "sips:"
#define CallConfigNULL NULL
#define CallConfigNULL 0
/*
* @file call.h
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment