aout_VolumeGet: return volume directly

[vlc] / include / vlc_fs.h

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index 5bdd10ce0d32153c05530a5d6e5e4648b50def47..da6d28e2800fd2477772c8270f87e1def661c210 100644 (file)
--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -44,8 +44,27 @@ VLC_EXPORT( int, vlc_mkdir, ( const char *filename, mode_t mode ) );
 VLC_EXPORT( int, vlc_unlink, ( const char *filename ) );
 VLC_EXPORT( int, vlc_rename, ( const char *oldpath, const char *newpath ) );
 
-#if defined( WIN32 ) && !defined( UNDER_CE )
-# define stat _stati64
+#if defined( WIN32 )
+# ifndef UNDER_CE
+#  define stat _stati64
+# endif
+static inline int vlc_closedir( DIR *dir )
+{
+    _WDIR *wdir = *(_WDIR **)dir;
+    free( dir );
+    return wdir ? _wclosedir( wdir ) : 0;
+}
+# undef closedir
+# define closedir vlc_closedir
+
+static inline void vlc_rewinddir( DIR *dir )
+{
+    _WDIR *wdir = *(_WDIR **)dir;
+
+    _wrewinddir( wdir );
+}
+# undef rewinddir
+# define rewinddir vlc_rewinddir
 #endif
 
 VLC_EXPORT( int, vlc_stat, ( const char *filename, struct stat *buf ) );
@@ -54,9 +73,5 @@ 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 );
-
+VLC_EXPORT( int, vlc_pipe, ( int[2] ) );
 #endif