From bb29acd2f25176a70759862417b99b8cbd082e2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 24 May 2008 11:33:03 +0300 Subject: [PATCH] vlc_wclosedir is still needed on Windows --- include/vlc_common.h | 2 ++ include/vlc_fixups.h | 6 ++++++ src/libvlc.h | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 0be1b3d2da..0ba6de4982 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -852,7 +852,9 @@ VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); *****************************************************************************/ #ifdef WIN32 VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); +VLC_EXPORT( int, vlc_wclosedir, (void *) ); #endif + VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) ); /***************************************************************************** diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 961aaa508e..4e7a8ae12f 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -136,6 +136,12 @@ typedef void *locale_t; # define freelocale( a ) (void)0 #endif +#ifdef WIN32 +# define opendir Use_utf8_opendir_or_vlc_wopendir_instead! +# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead! +# define closedir vlc_wclosedir +#endif + /* libintl support */ #define _(str) vlc_gettext (str) diff --git a/src/libvlc.h b/src/libvlc.h index 43989e8504..bb593a10db 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -281,11 +281,7 @@ void vlc_rewinddir(void *); # 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 -- 2.39.2