Win32 vlc_w.*dir: declare internally

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 1d142d7da77a0bee5371fc24f5b4812eb4517453..a5a449e29338179a699bcf8a4293ee47f3ea4bb9 100644 (file)
--- 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 <dirent.h>
- 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 93658ddf6e4a4e64187aaaa562950adb9784c16b..43989e8504491abf586bcab58bb546b5157376b7 100644 (file)
--- 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 <dirent.h>
+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