Compile fix

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index 5bdd10ce0d32153c05530a5d6e5e4648b50def47..1210683153ec1fb2eeca48a34ed5d711a5519143 100644 (file)
--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -54,9 +54,4 @@ VLC_EXPORT( int, vlc_lstat, ( const char *filename, struct stat *buf ) );
 VLC_EXPORT( int, vlc_mkstemp, ( char * ) );
 
 VLC_EXPORT( int, vlc_dup, ( int ) );
-int vlc_socket (int, int, int, bool nonblock) LIBVLC_USED;
-
-struct sockaddr;
-VLC_EXPORT( int, vlc_accept, ( int, struct sockaddr *, socklen_t *, bool ) LIBVLC_USED );
-
 #endif

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 8f938f6e82fcb15a11248b14f6ebc3cbb4e6e72a..a9603a2a486cb2ddfc1cf2c0212e5fbc6738acb6 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -77,6 +77,11 @@ struct msghdr
 #   define net_errno errno
 #endif
 
+int vlc_socket (int, int, int, bool nonblock) LIBVLC_USED;
+
+struct sockaddr;
+VLC_EXPORT( int, vlc_accept, ( int, struct sockaddr *, socklen_t *, bool ) LIBVLC_USED );
+
 # ifdef __cplusplus
 extern "C" {
 # endif

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 2a92dce44b8545d1c0413a44974793997464a13d..271ee0486edebe710319ae9a5e7761d4cd0896ca 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -33,7 +33,6 @@
 #include <assert.h>
 
 #include <vlc_network.h>
-#include <vlc_fs.h>
 #include <vlc_tls.h>
 #include <vlc_acl.h>
 #include <vlc_strings.h>

diff --git a/src/network/io.c b/src/network/io.c
index fddac63a5b22633c5d2bb3a33f6bbb2479c39f8f..bd15180d2fef9d9f980e0dfbe4bd6537281a9e06 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -52,7 +52,6 @@
 #endif
 
 #include <vlc_network.h>
-#include <vlc_fs.h>
 
 #ifndef INADDR_ANY
 #   define INADDR_ANY  0x00000000

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 9c35f16600f67da29226970df52a4281ca7a4773..7b1cdfa30135b9b3d16017b524ee4ee7db7a89c0 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -43,7 +43,6 @@
 #endif
 
 #include <vlc_network.h>
-#include <vlc_fs.h>
 #if defined (WIN32) || defined (UNDER_CE)
 #   undef EINPROGRESS
 #   define EINPROGRESS WSAEWOULDBLOCK

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 1025238bc0ee06eb6842f8a694e6124d255eaea2..40a158a75cb51a462a814752720732cb39df9582 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -617,6 +617,8 @@ int vlc_dup (int oldfd)
     return newfd;
 }
 
+#include <vlc_network.h>
+
 /**
  * Creates a socket file descriptor. The new file descriptor has the
  * close-on-exec flag set.