diff --git a/sflphone-common/libs/iax2/iax-client.h b/sflphone-common/libs/iax2/iax-client.h
index bd5bf609b768ef55b502e2ae00158f17fe78d5f4..7ba1d311f5053c99cca1704ab6229957bcc82363 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 00d06e7e5146f3f69a5108bb05f7de90258d3ddb..3ae3c25b82df55487b1ae934f36afca477ccec39 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 56382221c44102643e3c38482b8b826cd716b52d..5524d26b1f031673ba93cc38a11fb47a6ce232d2 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>