From 00e71fbf49079629e40aca7468d906848343c7e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 24 May 2008 11:18:51 +0300 Subject: [PATCH] Win32 vlc_w.*dir: declare internally --- include/vlc_common.h | 15 --------------- src/libvlc.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 1d142d7da7..a5a449e293 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -754,21 +754,6 @@ VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) ); VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) ); VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) ); -#if defined (WIN32) -# include - VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) ); - VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) ); - VLC_EXPORT( int, vlc_wclosedir, ( void * ) ); - VLC_INTERNAL( void, vlc_rewinddir, ( void * ) ); -# define opendir Use_utf8_opendir_or_vlc_wopendir_instead! -# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead! -# define closedir vlc_wclosedir -# define _wopendir vlc_wopendir -# define _wreaddir vlc_wreaddir -# define _wclosedir vlc_wclosedir -# define rewinddir vlc_rewinddir -#endif - #if defined(WIN32) || defined(UNDER_CE) /* win32, cl and icl support */ # if defined( _MSC_VER ) || !defined( __MINGW32__ ) diff --git a/src/libvlc.h b/src/libvlc.h index 93658ddf6e..43989e8504 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -277,4 +277,19 @@ int vlc_closedir(void *); void vlc_rewinddir(void *); # endif +#if defined (WIN32) +# include +void *vlc_wopendir (const wchar_t *); +struct _wdirent *vlc_wreaddir (void *); +int vlc_wclosedir (void *); +void vlc_rewinddir (void *); +# define opendir Use_utf8_opendir_or_vlc_wopendir_instead! +# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead! +# define closedir vlc_wclosedir +# define _wopendir vlc_wopendir +# define _wreaddir vlc_wreaddir +# define _wclosedir vlc_wclosedir +# define rewinddir vlc_rewinddir +#endif + #endif -- 2.39.2