X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_charset.h;h=0788b17f2487a22747d8e75dd6f05dac615c1d70;hb=588723d7c65ccdb0fa5cc39b3cae132176637300;hp=7899ccfaeb86364b2dd1cc4e0b29cad9724f378b;hpb=6bc9799c8a4d70e2761ae26b7a54c205823782c9;p=vlc diff --git a/include/vlc_charset.h b/include/vlc_charset.h index 7899ccfaeb..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 @@ -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,12 +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_atof, ( const char * ) ); VLC_EXPORT( double, us_strtod, ( const char *, char ** ) ); VLC_EXPORT( double, us_atof, ( const char * ) );