Changeset 4f5b5ee95cec30c3bfe13e5b28790a9008dbcf03

Timestamp:

01/08/07 01:41:45 (2 years ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1168216905 +0000

git-parent:

[9ed73544c60347d441b633200d0d681f56228f0d]

git-author:

Damien Fouilleul <damienf@videolan.org> 1168216905 +0000

Message:

- since DIR* on win32 is mapped to a private data type, rewinddir(), seekdir() and telldir() must also be mapped to their vlc_ equivalent. Should fix ticket #926

Files:

• include/vlc_common.h (modified) (3 diffs)
• src/extras/libc.c (modified) (2 diffs)

include/vlc_common.h

@@ -959 +959 @@
-#   define readdir vlc_readdir
-#   define closedir vlc_closedir
+#   define rewinddir vlc_rewindir
+#   define seekdir vlc_seekdir
+#   define telldir vlc_telldir
-    VLC_EXPORT( void *, vlc_opendir, ( const char * ) );
-    VLC_EXPORT( void *, vlc_readdir, ( void * ) );
-    VLC_EXPORT( int, vlc_closedir, ( void * ) );
+    VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
+    VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
+    VLC_INTERNAL( long, vlc_telldir, ( void * ) );
-#else
-    struct dirent;  /* forward declaration for vlc_symbols.h */
@@ -976 +982 @@
-VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) );
-VLC_INTERNAL( int, vlc_wclosedir, ( void * ) );
+VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
+VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
+VLC_INTERNAL( long, vlc_telldir, ( void * ) );
-#   define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
-#   define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
@@ -981 +990 @@
-#   define _wopendir vlc_wopendir
-#   define _wreaddir vlc_wreaddir
-
+
+
+
-#endif
-

src/extras/libc.c

@@ -56 +56 @@
-#   undef _wreaddir
-#   undef _wclosedir
+#   undef rewinddir
+#   undef seekdir
+#   undef telldir
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
@@ -483 +486 @@
-    free( p_dir );
-    return i_ret;
+}
+
+void vlc_rewinddir( void *_p_dir )
+{
+    vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+    if ( p_dir->p_real_dir != NULL )
+        _wrewinddir( p_dir->p_real_dir );
+}
+
+void vlc_seekdir( void *_p_dir, long loc)
+{
+    vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+    if ( p_dir->p_real_dir != NULL )
+        _wseekdir( p_dir->p_real_dir, loc );
+}
+
+long vlc_telldir( void *_p_dir )
+{
+    vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+
+    if ( p_dir->p_real_dir != NULL )
+        return _wtelldir( p_dir->p_real_dir );
+    return 0;
-}
-#endif