network: Include unistd.h from network.h

This heaader is required for close() for sockets in network
code. For winsock, the equivalent function is defined in the
winsock2.h header.

This avoids having the HAVE_UNISTD_H in all files dealing with
raw sockets.

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/libavformat/network.h b/libavformat/network.h
index 1dc9deb..3e4422e 100644 (file)
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -27,6 +27,10 @@
 #include "libavutil/error.h"
 #include "os_support.h"
 
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #include <ws2tcpip.h>

diff --git a/libavformat/sctp.c b/libavformat/sctp.c
index 07de498..7bcb5ae 100644 (file)
--- a/libavformat/sctp.c
+++ b/libavformat/sctp.c
@@ -39,7 +39,6 @@
 
 #include <netinet/in.h>
 #include <netinet/sctp.h>
-#include <unistd.h>
 
 #include "config.h"
 

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index e77e4c5..badc0ba 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -20,7 +20,6 @@
  */
 #include "avformat.h"
 #include "libavutil/parseutils.h"
-#include <unistd.h>
 #include "internal.h"
 #include "network.h"
 #include "os_support.h"

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 39db263..71b445b 100644 (file)
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -30,7 +30,6 @@
 #include "avio_internal.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/avstring.h"
-#include <unistd.h>
 #include "internal.h"
 #include "network.h"
 #include "os_support.h"