X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_charset.h;h=aaa9d58a6526d891d5a8cd10524a7debd10b24dd;hb=2915b611a1c64c6c9b3dd5dcda951e0787916ca9;hp=81af0c1df176b4915aedb76af0ee4901be8ac582;hpb=599c47de9d9b5c4d8c8c406422c42f844c6e1d4f;p=vlc diff --git a/include/vlc_charset.h b/include/vlc_charset.h index 81af0c1df1..aaa9d58a65 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -2,7 +2,7 @@ * charset.h: Unicode UTF-8 wrappers function ***************************************************************************** * Copyright (C) 2003-2005 the VideoLAN team - * Copyright © 2005-2006 Rémi Denis-Courmont + * Copyright © 2005-2010 Rémi Denis-Courmont * $Id$ * * Author: Rémi Denis-Courmont @@ -31,8 +31,6 @@ */ #include -#include -#include VLC_EXPORT( void, LocaleFree, ( const char * ) ); VLC_EXPORT( char *, FromLocale, ( const char * ) LIBVLC_USED ); @@ -40,29 +38,9 @@ VLC_EXPORT( char *, FromLocaleDup, ( const char * ) LIBVLC_USED ); VLC_EXPORT( char *, ToLocale, ( const char * ) LIBVLC_USED ); VLC_EXPORT( char *, ToLocaleDup, ( const char * ) LIBVLC_USED ); -/* TODO: move all of this to "vlc_fs.h" or something like that */ -VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, ... ) LIBVLC_USED ); -VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) LIBVLC_USED ); -VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) LIBVLC_USED ); -VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) LIBVLC_USED ); -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 ** ) ) ); -VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) ); -VLC_EXPORT( int, utf8_unlink, ( const char *filename ) ); -int utf8_rename( const char *, const char * ); - -#if defined( WIN32 ) && !defined( UNDER_CE ) -# define stat _stati64 -#endif - -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 *, ... ) LIBVLC_FORMAT( 2, 3 ) ); -VLC_EXPORT( int, utf8_mkstemp, ( char * ) ); - VLC_EXPORT( char *, EnsureUTF8, ( char * ) ); VLC_EXPORT( const char *, IsUTF8, ( const char * ) LIBVLC_USED ); @@ -111,8 +89,6 @@ static inline char *FromLatin1 (const char *latin) VLC_EXPORT( char *, FromCharset, ( const char *charset, const void *data, size_t data_size ) LIBVLC_USED ); -VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) LIBVLC_USED ); - VLC_EXPORT( double, us_strtod, ( const char *, char ** ) LIBVLC_USED ); VLC_EXPORT( float, us_strtof, ( const char *, char ** ) LIBVLC_USED ); VLC_EXPORT( double, us_atof, ( const char * ) LIBVLC_USED );