Add vlclua_dir_list_free to free list created by vlclua_dir_list and use it.

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 69b65b9e0a1bd67fd79de2aaf2fc2252fc739bd8..0788b17f2487a22747d8e75dd6f05dac615c1d70 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -22,10 +22,6 @@
  * 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
 
@@ -57,7 +53,7 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) );
 VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) );
 
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
-VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
+VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) );
 
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
 VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
@@ -76,8 +72,6 @@ static inline char *FromWide (const wchar_t *wide)
 }
 #endif
 
-VLC_INTERNAL( bool, vlc_current_charset, ( char ** ) );
-
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
 
 VLC_EXPORT( double, us_strtod, ( const char *, char ** ) );