libvlccore: Add vlc_wclosedir to the exported symbols.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index bd56d978ad40ddbeed406968bf28a8bb0f6a6916..c629db677ab71836d5dca52059e4ac50327dd2ea 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -774,6 +774,9 @@ VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
 VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) );
 #define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
 
+/* dir wrappers (defined in src/extras/libc.c) */
+VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir ));
+
 /*****************************************************************************
  * CPU capabilities
  *****************************************************************************/

diff --git a/src/extras/libc.c b/src/extras/libc.c
index a887c2d2cca85d8050ee4f359ce28757711d694b..4f62486e25871178225b180999c0f66f1d822473 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -296,26 +296,31 @@ struct _wdirent *vlc_wreaddir( void *_p_dir )
     return &p_dir->dd_dir;
 }
 
-int vlc_wclosedir( void *_p_dir )
+void vlc_rewinddir( void *_p_dir )
 {
     vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
-    int i_ret = 0;
 
     if ( p_dir->p_real_dir != NULL )
-        i_ret = _wclosedir( p_dir->p_real_dir );
-
-    free( p_dir );
-    return i_ret;
+        _wrewinddir( p_dir->p_real_dir );
 }
+#endif
 
-void vlc_rewinddir( void *_p_dir )
+/* This one is in the libvlccore exported symbol list */
+int vlc_wclosedir( void *_p_dir )
 {
+#if defined(WIN32) && !defined(UNDER_CE)
     vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
+    int i_ret = 0;
 
     if ( p_dir->p_real_dir != NULL )
-        _wrewinddir( p_dir->p_real_dir );
-}
+        i_ret = _wclosedir( p_dir->p_real_dir );
+
+    free( p_dir );
+    return i_ret;
+#else
+    return closedir( _p_dir );
 #endif
+}
 
 #if defined (WIN32)
 /**

diff --git a/src/libvlc.h b/src/libvlc.h
index 69713f2dc878c309d0afde2e0a6b5efd0f614d0b..ff0ce6125b82f87a98d253522f2e43075ab16098 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -280,7 +280,7 @@ void  vlc_rewinddir(void *);
 #if defined (WIN32)
 #   include <dirent.h>
 void *vlc_wopendir (const wchar_t *);
-void *vlc_wclosedir (void *);
+/* void *vlc_wclosedir (void *); in vlc's exported symbols */
 struct _wdirent *vlc_wreaddir (void *);
 void vlc_rewinddir (void *);
 #   define _wopendir vlc_wopendir

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 0d17d86d5377bfaae616c189a9fed4b84c008124..64119e09f2e6ee4656bfb2faeded70d54dd295bb 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -454,6 +454,7 @@ vlc_threadvar_create
 vlc_threadvar_delete
 vlc_ureduce
 VLC_Version
+vlc_wclosedir
 vlc_wraptext
 vlm_Control
 vlm_Delete