win32: re-enable xconnect.c

3 files changed, 14 insertions, 3 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 31e733d77..01aee206e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -484,7 +484,6 @@ void xlisten(int s, int backlog) FAST_FUNC;
 void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) FAST_FUNC;
 ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
                                 socklen_t tolen) FAST_FUNC;
-#if !ENABLE_PLATFORM_MINGW32
 /* SO_REUSEADDR allows a server to rebind to an address that is already
  * "in use" by old connections to e.g. previous server instance which is
  * killed or crashed. Without it bind will fail until all such connections
@@ -597,7 +596,6 @@ ssize_t recv_from_to(int fd, void *buf, size_t len, int flags,
                 struct sockaddr *from,
                 struct sockaddr *to,
                 socklen_t sa_size) FAST_FUNC;
-#endif
 
 
 char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC;
diff --git a/include/mingw.h b/include/mingw.h
index 1caf65464..a7352bdfb 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -49,6 +49,19 @@ static inline void endgrent(void) {}
 #define NAME_MAX 255
 #define MAXSYMLINKS 20
 
+/*
+ * netdb.h
+ */
+
+typedef int sa_family_t;
+
+/*
+ * linux/un.h
+ */
+struct sockaddr_un {
+        sa_family_t sun_family;
+        char sun_path[1]; /* to make compiler happy, don't bother */
+};
 
 /*
  * poll.h
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index f30fa4818..9ea3d735d 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -100,6 +100,7 @@ lib-y += wfopen.o
 lib-y += wfopen_input.o
 lib-y += write.o
 lib-y += xatonum.o
+lib-y += xconnect.o
 lib-y += xfunc_die.o
 lib-y += xfuncs.o
 lib-y += xfuncs_printf.o
@@ -118,7 +119,6 @@ lib-$(CONFIG_PLATFORM_POSIX) += read_key.o
 lib-$(CONFIG_PLATFORM_POSIX) += safe_gethostname.o
 lib-$(CONFIG_PLATFORM_POSIX) += signals.o
 lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o
-lib-$(CONFIG_PLATFORM_POSIX) += xconnect.o
 lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o
 
 lib-$(CONFIG_FEATURE_UTMP) += utmp.o