Commit 1e50cd4c authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

libvlccore: Add vlc_wclosedir to the exported symbols.

parent 6475cab1
...@@ -774,6 +774,9 @@ VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); ...@@ -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 ) ); 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) #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 * CPU capabilities
*****************************************************************************/ *****************************************************************************/
......
...@@ -296,26 +296,31 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) ...@@ -296,26 +296,31 @@ struct _wdirent *vlc_wreaddir( void *_p_dir )
return &p_dir->dd_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; vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
int i_ret = 0;
if ( p_dir->p_real_dir != NULL ) if ( p_dir->p_real_dir != NULL )
i_ret = _wclosedir( p_dir->p_real_dir ); _wrewinddir( p_dir->p_real_dir );
free( p_dir );
return i_ret;
} }
#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; vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
int i_ret = 0;
if ( p_dir->p_real_dir != NULL ) 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 #endif
}
#if defined (WIN32) #if defined (WIN32)
/** /**
......
...@@ -280,7 +280,7 @@ void vlc_rewinddir(void *); ...@@ -280,7 +280,7 @@ void vlc_rewinddir(void *);
#if defined (WIN32) #if defined (WIN32)
# include <dirent.h> # include <dirent.h>
void *vlc_wopendir (const wchar_t *); void *vlc_wopendir (const wchar_t *);
void *vlc_wclosedir (void *); /* void *vlc_wclosedir (void *); in vlc's exported symbols */
struct _wdirent *vlc_wreaddir (void *); struct _wdirent *vlc_wreaddir (void *);
void vlc_rewinddir (void *); void vlc_rewinddir (void *);
# define _wopendir vlc_wopendir # define _wopendir vlc_wopendir
......
...@@ -454,6 +454,7 @@ vlc_threadvar_create ...@@ -454,6 +454,7 @@ vlc_threadvar_create
vlc_threadvar_delete vlc_threadvar_delete
vlc_ureduce vlc_ureduce
VLC_Version VLC_Version
vlc_wclosedir
vlc_wraptext vlc_wraptext
vlm_Control vlm_Control
vlm_Delete vlm_Delete
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment