Commit 04ad4fc7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Do not export vlc_wclosedir()

parent 1da83920
......@@ -845,9 +845,6 @@ 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 ) LIBVLC_USED );
#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 ));
VLC_EXPORT( void, vlc_tdestroy, ( void *, void (*)(void *) ) );
/* Fast large memory copy and memory set */
......
......@@ -197,13 +197,6 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
}
#endif
#ifdef WIN32
# include <dirent.h>
# define opendir Use_vlc_opendir_or_vlc_wopendir_instead!
# define readdir Use_vlc_readdir_or_vlc_wreaddir_instead!
# define closedir vlc_wclosedir
#endif
/* libintl support */
#define _(str) vlc_gettext (str)
#define N_(str) gettext_noop (str)
......
......@@ -32,7 +32,6 @@
#include <vlc_common.h>
#include <errno.h>
#include <dirent.h>
#undef iconv_t
#undef iconv_open
......@@ -55,12 +54,9 @@
#endif
#if defined(WIN32) || defined(UNDER_CE)
# undef _wopendir
# undef _wreaddir
# undef _wclosedir
# undef rewinddir
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <dirent.h>
#endif
/*****************************************************************************
......@@ -167,12 +163,10 @@ void vlc_rewinddir( void *_p_dir )
if ( p_dir->p_real_dir != NULL )
_wrewinddir( p_dir->p_real_dir );
}
#endif
/* This one is in the libvlccore exported symbol list */
int vlc_wclosedir( void *_p_dir )
{
#if defined(WIN32)
vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
int i_ret = 0;
......@@ -181,10 +175,9 @@ int vlc_wclosedir( void *_p_dir )
free( p_dir );
return i_ret;
#else
return closedir( _p_dir );
#endif
}
#endif
#ifdef ENABLE_NLS
# include <libintl.h>
......
......@@ -330,7 +330,7 @@ VLC_EXPORT( void, stats_DumpInputStats, (input_stats_t *) );
#if defined (WIN32)
# include <dirent.h>
void *vlc_wopendir (const wchar_t *);
/* void *vlc_wclosedir (void *); in vlc's exported symbols */
void *vlc_wclosedir (void *);
struct _wdirent *vlc_wreaddir (void *);
void vlc_rewinddir (void *);
# define _wopendir vlc_wopendir
......
......@@ -615,7 +615,6 @@ vlc_timer_getoverrun
vlc_timer_schedule
vlc_ureduce
VLC_Version
vlc_wclosedir
vlc_epg_Init
vlc_epg_Clean
vlc_epg_New
......
......@@ -362,6 +362,7 @@ block_t *block_mmap_Alloc (void *addr, size_t length)
#ifdef WIN32
# include <io.h>
#ifdef UNDER_CE
#define _get_osfhandle(a) ((long) (a))
#endif
......
......@@ -1026,6 +1026,9 @@ void path_sanitize( char *str )
}
#include <vlc_url.h>
#ifdef WIN32
# include <io.h>
#endif
/**
* Convert a file path to an URI.
......
......@@ -47,6 +47,7 @@
#elif defined (WIN32) || defined (UNDER_CE)
# define USE_MB2MB 1
# include <io.h>
static char *locale_dup (const char *string, bool from)
{
......
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