WinCE: cleaning my header inclusion mess

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index d3d4008fdd9a9a0a9d0016661ecb58c97a6fdeaa..69bdc178824914445eb9934aa13807060dbf4276 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -22,33 +22,35 @@
  * 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
 
-#ifndef __VLC_CHARSET_H
-#define __VLC_CHARSET_H 1
+/**
+ * \file
+ * This files handles locale conversions in vlc
+ */
 
 #include <stdarg.h>
 #include <sys/types.h>
 #include <dirent.h>
 
 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 *, FromLocale, ( const char * ) LIBVLC_USED );
+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, 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_open, ( const char *filename, int flags, mode_t mode ) 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 ) );
 
-#ifdef WIN32
+#if defined( WIN32 ) && !defined( UNDER_CE )
 # define stat _stati64
 #endif
 
@@ -56,12 +58,13 @@ 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 * ) );
+VLC_EXPORT( const char *, IsUTF8, ( const char * ) LIBVLC_USED );
 
 #ifdef WIN32
+LIBVLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
     size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
@@ -70,19 +73,15 @@ static inline char *FromWide (const wchar_t *wide)
 
     char *out = (char *)malloc (len);
 
-    WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
+    if (out)
+        WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
     return out;
 }
 #endif
 
-VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
-VLC_INTERNAL( vlc_bool_t, vlc_current_charset, ( char ** ) );
-
-VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
+VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) LIBVLC_USED );
 
-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 * ) );
+VLC_EXPORT( double, us_strtod, ( const char *, char ** ) LIBVLC_USED );
+VLC_EXPORT( double, us_atof, ( const char * ) LIBVLC_USED );
 
 #endif