X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_charset.h;h=0788b17f2487a22747d8e75dd6f05dac615c1d70;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=b7b77b228f4b821a85dc5201096e1290bf477c83;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index b7b77b228f..0788b17f24 100644
--- 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
 
@@ -37,6 +33,7 @@ VLC_EXPORT( void, LocaleFree, ( const char * ) );
 VLC_EXPORT( char *, FromLocale, ( const char * ) );
 VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
 VLC_EXPORT( char *, ToLocale, ( const char * ) );
+VLC_EXPORT( char *, ToLocaleDup, ( 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 ) );
@@ -56,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 * ) );
@@ -75,13 +72,8 @@ static inline char *FromWide (const wchar_t *wide)
 }
 #endif
 
-VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
-VLC_INTERNAL( bool, vlc_current_charset, ( char ** ) );
-
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
 
-VLC_INTERNAL( double, i18n_strtod, ( const char *, char ** ) );
-VLC_INTERNAL( double, i18n_atof, ( const char * ) );
 VLC_EXPORT( double, us_strtod, ( const char *, char ** ) );
 VLC_EXPORT( double, us_atof, ( const char * ) );