[vlc-commits] commit: Compile fix ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar 31 23:41:40 2010 +0300| [fa343f78a532b2cfe62c7ec456176fb77e1223b8] | committer: Rémi Denis-Courmont 

Compile fix

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa343f78a532b2cfe62c7ec456176fb77e1223b8
---

 include/vlc_fs.h      |    5 -----
 include/vlc_network.h |    5 +++++
 src/network/httpd.c   |    1 -
 src/network/io.c      |    1 -
 src/network/tcp.c     |    1 -
 src/text/filesystem.c |    2 ++
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index 5bdd10c..1210683 100644
--- 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 8f938f6..a9603a2 100644
--- 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 2a92dce..271ee04 100644
--- 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 fddac63..bd15180 100644
--- 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 9c35f16..7b1cdfa 100644
--- 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 1025238..40a158a 100644
--- 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.