From 65c575287635a4fc1ba37af3e9ddd2cd17143203 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Thu, 10 Mar 2011 14:22:47 -0500
Subject: [PATCH] [#5211] Fix strict aliasing rules warning in pjsip
---
sflphone-common/src/sip/sipvoiplink.cpp | 6 +++---
sflphone-common/src/sip/sipvoiplink.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 50a275d834..4fa943bf55 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -357,7 +357,7 @@ SIPVoIPLink::terminate()
/* Clean shutdown of pjsip library */
if (initDone()) {
_debug ("UserAgent: Shutting down PJSIP");
- pjsip_shutdown();
+ pjsipShutdown();
}
initDone (false);
@@ -3028,7 +3028,7 @@ void SIPVoIPLink::busySleep (unsigned msec)
#endif
}
-bool SIPVoIPLink::pjsip_shutdown (void)
+bool SIPVoIPLink::pjsipShutdown (void)
{
if (_endpt) {
_debug ("UserAgent: Shutting down...");
@@ -4763,7 +4763,7 @@ std::string SIPVoIPLink::getInterfaceAddrFromName (std::string ifaceName)
saddr_in = (struct sockaddr_in *) &ifr.ifr_addr;
addr_in = & (saddr_in->sin_addr);
- std::string addr (pj_inet_ntoa (* ( (pj_in_addr*) addr_in)));
+ std::string addr (inet_ntoa (*addr_in));
close (fd);
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index a2c2b0789a..731d560d07 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -449,7 +449,7 @@ class SIPVoIPLink : public VoIPLink
/**
* Delete link-related stuff like calls
*/
- bool pjsip_shutdown (void);
+ bool pjsipShutdown (void);
/**
* Resolve public address for this account
--
GitLab