Merge pull request #614 from sippy/2.1

Fix build on FreeBSD (2.1 branch) (cherry picked from commit 76a0a56)
OpenSIPS · Aug 25, 2015 · c0a0f12 · c0a0f12
1 parent 019494b
commit c0a0f12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/io_wait.h b/io_wait.h
@@ -350,8 +350,13 @@ inline static int io_watch_add(	io_wait_h* h,
 			h->name, prio, h->max_prio);
 		goto error;
 	}
+#if defined (HAVE_EPOLL)
 	LM_DBG("[%s] io_watch_add op (%d on %d) (%p, %d, %d, %p,%d), fd_no=%d/%d\n",
 			h->name,fd,h->epfd, h,fd,type,data,flags,h->fd_no,h->max_fd_no);
+#else
+	LM_DBG("[%s] io_watch_add op (%d) (%p, %d, %d, %p,%d), fd_no=%d/%d\n",
+			h->name,fd, h,fd,type,data,flags,h->fd_no,h->max_fd_no);
+#endif
 	//fd_array_print;
 	/*  hash sanity check */
 	e=get_fd_map(h, fd);

diff --git a/io_wait_loop.h b/io_wait_loop.h
@@ -214,7 +214,7 @@ inline static int io_wait_loop_kqueue(io_wait_h* h, int t, int repeat)
 		if (n==-1){
 			if (errno==EINTR) goto again; /* signal, ignore it */
 			else{
-				LM_ERR("[%s] kevent: %s [%d]\n", strerror(errno), errno);
+				LM_ERR("[%s] kevent: %s [%d]\n", h->name, strerror(errno), errno);
 				goto error;
 			}
 		}

diff --git a/net/net_tcp.c b/net/net_tcp.c
@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>