From d399253c88e594bdc1d1bdf53e13e2c9959bc83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Tue, 5 Jul 2011 09:48:12 -0400
Subject: [PATCH] IAX: fix warnings (cherry picked from commit
fd7a113a11cac2cd9a7c36929e88ad28195c4c35)
---
sflphone-common/libs/iax2/iax-client.h | 2 +-
sflphone-common/libs/iax2/iax.c | 3 +--
sflphone-common/libs/iax2/md5.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/libs/iax2/iax-client.h b/sflphone-common/libs/iax2/iax-client.h
index bd5bf609b7..7ba1d311f5 100644
--- a/sflphone-common/libs/iax2/iax-client.h
+++ b/sflphone-common/libs/iax2/iax-client.h
@@ -19,7 +19,7 @@
#pragma warning(disable:4200)
#endif
-#ifndef LINUX
+#ifndef __linux__
#define socklen_t int
#endif
diff --git a/sflphone-common/libs/iax2/iax.c b/sflphone-common/libs/iax2/iax.c
index 00d06e7e51..3ae3c25b82 100644
--- a/sflphone-common/libs/iax2/iax.c
+++ b/sflphone-common/libs/iax2/iax.c
@@ -878,7 +878,6 @@ int iax_init(int preferredportno)
{
struct sockaddr_in sin;
socklen_t sinlen;
- socklen_t *slen = &sinlen;
int flags;
int bufsize = 256 * 1024;
@@ -929,7 +928,7 @@ int iax_init(int preferredportno)
}
sinlen = sizeof(sin);
- if (getsockname(netfd, (struct sockaddr *) &sin, slen) < 0)
+ if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0)
{
close(netfd);
netfd = -1;
diff --git a/sflphone-common/libs/iax2/md5.c b/sflphone-common/libs/iax2/md5.c
index 56382221c4..5524d26b1f 100644
--- a/sflphone-common/libs/iax2/md5.c
+++ b/sflphone-common/libs/iax2/md5.c
@@ -3,7 +3,7 @@
#ifdef FREEBSD
# include <machine/endian.h>
-#elif defined(LINUX)
+#elif defined(__linux__)
# include <endian.h>
# include <features.h>
# include <sys/types.h>
--
GitLab