From 6e3f09186e0a5e89eb729840f71e2a73684e9b50 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 4 Aug 2014 17:36:12 +0200
Subject: erts: Fix tc and docs after {fd,FD} bind change

The sha of the original change is 52810718b
---
 lib/kernel/doc/src/gen_udp.xml                             | 7 ++++++-
 lib/kernel/test/gen_tcp_api_SUITE_data/Makefile.src        | 1 +
 lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 503725fe18..291d1b0da7 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -84,7 +84,12 @@
           <item>
             <p>If a socket has somehow been opened without using
               <c>gen_udp</c>, use this option to pass the file
-              descriptor for it.</p>
+              descriptor for it. If <c><anno>Port</anno></c> is not set to 0
+              and/or <c>{ip, ip_address()}</c> is combined with this option
+              the fd will be bound to the given interface and port after being
+              opened. If these options are not given it is assumed that the fd
+              is already bound appropriately.
+            </p>
           </item>
           <tag><c>inet6</c></tag>
           <item>
diff --git a/lib/kernel/test/gen_tcp_api_SUITE_data/Makefile.src b/lib/kernel/test/gen_tcp_api_SUITE_data/Makefile.src
index b6027de0d7..5477598160 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE_data/Makefile.src
+++ b/lib/kernel/test/gen_tcp_api_SUITE_data/Makefile.src
@@ -1,5 +1,6 @@
 
 NIF_LIBS = gen_tcp_api_SUITE@dll@
+SHLIB_EXTRA_LDLIBS = @LIBS@
 
 all: $(NIF_LIBS)
 
diff --git a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
index 6be7838363..73a6568b30 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
+++ b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
@@ -22,13 +22,12 @@
 #include <string.h>
 #include <assert.h>
 #include <limits.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 
 #ifdef __WIN32__
 #include <winsock2.h>
 #else
-
+#include <sys/socket.h>
 #endif
 
 #define sock_open(af, type, proto)  socket((af), (type), (proto))
-- 
cgit v1.2.3