From d443097778e22c51173aaa22b71303b05a89cf84 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 28 Jan 2019 14:39:17 +0100
Subject: Fix build of erl_interface on BSD

---
 lib/erl_interface/src/misc/ei_portio.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/erl_interface/src/misc/ei_portio.c')

diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index 726b1af82d..368c56546b 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -19,6 +19,9 @@
  *
 
  */
+
+#include "eidef.h"
+
 #ifdef __WIN32__
 #include <winsock2.h>
 #include <windows.h>
@@ -47,10 +50,8 @@ static unsigned long param_one = 1;
 #include <taskLib.h>
 #include <inetLib.h>
 #include <selectLib.h>
-#include <sys/types.h>
 #include <ioLib.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h> 
@@ -65,7 +66,6 @@ static unsigned long param_one = 1;
 
 #else /* other unix */
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -86,6 +86,7 @@ static unsigned long param_one = 1;
 
 /* common includes */
 
+#include <sys/types.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <string.h>
@@ -94,7 +95,9 @@ static unsigned long param_one = 1;
 #else
 #include <time.h>
 #endif
-#include "eidef.h"
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 #include "ei_portio.h"
 #include "ei_internal.h"
 
-- 
cgit v1.2.3


From 50bf9f5d8403b9903ea63867611ac16ffec1c14c Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 29 Jan 2019 16:58:13 +0100
Subject: Fix bug in ei_accept_tmo

---
 lib/erl_interface/src/misc/ei_portio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/erl_interface/src/misc/ei_portio.c')

diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index 368c56546b..bccc86c1b1 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -249,7 +249,7 @@ static int tcp_accept(void **ctx, void *addr, int *len, unsigned unused)
     if (res)
         return res;
     
-    res = accept(fd, (struct sockaddr*) &addr, &addr_len);
+    res = accept(fd, (struct sockaddr*) addr, &addr_len);
     if (MEANS_SOCKET_ERROR(res))
         return get_error();
 
-- 
cgit v1.2.3