[Turnserver-devel] SF.net SVN: turnserver:[241] trunk/src

[<s-v...@us...>]

Revision: 241
          http://sourceforge.net/p/turnserver/code/241
Author:   s-vincent
Date:     2013-12-21 20:31:44 +0000 (Sat, 21 Dec 2013)
Log Message:
-----------
Fixes compilation on FreeBSD 9.x.

Modified Paths:
--------------
    trunk/src/Makefile.am
    trunk/src/test_echo_server.c
    trunk/src/tls_peer.c

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2013-12-21 17:34:42 UTC (rev 240)
+++ trunk/src/Makefile.am	2013-12-21 20:31:44 UTC (rev 241)
@@ -1,4 +1,4 @@
-AM_CFLAGS = -std=c99 -Wall -Wextra -Werror -Wstrict-prototypes -Wredundant-decls -Wshadow -pedantic -fno-strict-aliasing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -O2 -D_SVID_SOURCE
+AM_CFLAGS = -std=c99 -Wall -Wextra -Werror -Wstrict-prototypes -Wredundant-decls -Wshadow -pedantic -fno-strict-aliasing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -O2
 
 if ENABLE_DEBUG_BUILD
 AM_CFLAGS += -g 

Modified: trunk/src/test_echo_server.c
===================================================================
--- trunk/src/test_echo_server.c	2013-12-21 17:34:42 UTC (rev 240)
+++ trunk/src/test_echo_server.c	2013-12-21 20:31:44 UTC (rev 241)
@@ -132,15 +132,15 @@
 
   while(g_run)
   {
-    fd_set fdsr;
+    sfd_set fdsr;
     int nsock = sock;
 
-    FD_ZERO(&fdsr);
-    FD_SET(sock, &fdsr);
+    NET_SFD_ZERO(&fdsr);
+    NET_SFD_SET(sock, &fdsr);
 
     nsock++;
 
-    if(select(nsock, &fdsr, NULL, NULL, NULL) > 0)
+    if(select(nsock, (fd_set*)(void*)&fdsr, NULL, NULL, NULL) > 0)
     {
       if(FD_ISSET(sock, &fdsr))
       {

Modified: trunk/src/tls_peer.c
===================================================================
--- trunk/src/tls_peer.c	2013-12-21 17:34:42 UTC (rev 240)
+++ trunk/src/tls_peer.c	2013-12-21 20:31:44 UTC (rev 241)
@@ -491,10 +491,10 @@
 
   while(!speer->handshake_complete)
   {
-    fd_set fdsr;
+    sfd_set fdsr;
 
-    FD_ZERO(&fdsr);
-    FD_SET(peer->sock, &fdsr);
+    NET_SFD_ZERO(&fdsr);
+    NET_SFD_SET(peer->sock, &fdsr);
 
     /* 5 seconds of timeout */
     tv.tv_sec = 5;
@@ -514,7 +514,7 @@
       }
     }
 
-    ret = select(nsock, &fdsr, NULL, NULL, &tv);
+    ret = select(nsock, (fd_set*)(void*)&fdsr, NULL, NULL, &tv);
 
     if(ret > 0)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.