* open file widget: do nothing if the user clicked on cancel

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index eec9d42973204f2b66529bd852900ad3b52175ec..e9791719a25e69ba21ebddbf9d430820db50014a 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -22,6 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef __VLC_CHARSET_H
 #define __VLC_CHARSET_H 1
 
@@ -34,10 +38,12 @@ VLC_EXPORT( char *, FromLocale, ( const char * ) );
 VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
 VLC_EXPORT( char *, ToLocale, ( const char * ) );
 
+/* TODO: move all of this to "vlc_fs.h" or something like that */
 VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, mode_t mode ) );
 VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) );
 VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) );
 VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) );
+VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
 VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
 
 #ifdef WIN32