Fix warning, and make config_end constant

[vlc] / include / charset.h

diff --git a/include/charset.h b/include/charset.h
index 7e98ca9f1883e26bfcbde8f23063266dfb6b8cd5..f0e637e58a111ea734e68d232e371dda3d434f70 100644 (file)
--- a/include/charset.h
+++ b/include/charset.h
@@ -1,12 +1,11 @@
 /*****************************************************************************
- * charset.h: Determine a canonical name for the current locale's character encoding.
+ * charset.h: Unicode UTF-8 wrappers function
  *****************************************************************************
  * Copyright (C) 2003-2005 the VideoLAN team
  * Copyright © 2005-2006 Rémi Denis-Courmont
  * $Id$
  *
- * Authors: Rémi Denis-Courmont <rem # videolan,org>
- *          Derk-Jan Hartman <thedj at users.sourceforge.net>
+ * Author: Rémi Denis-Courmont <rem # videolan,org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,11 +28,6 @@
 #include <stdarg.h>
 #include <sys/types.h>
 
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-VLC_EXPORT( vlc_bool_t, vlc_current_charset, ( char ** ) );
 VLC_EXPORT( void, LocaleFree, ( const char * ) );
 VLC_EXPORT( char *, FromLocale, ( const char * ) );
 VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
@@ -44,8 +38,13 @@ VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) );
 VLC_EXPORT( void *, utf8_opendir, ( const char *dirname ) );
 VLC_EXPORT( char *, utf8_readdir, ( void *dir ) );
 VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, utf8_stat, ( const char *filename, void *buf ) );
-VLC_EXPORT( int, utf8_lstat, ( const char *filename, void *buf ) );
+
+#ifdef WIN32
+# 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_mkdir, ( const char *filename ) );
 
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
@@ -61,27 +60,21 @@ static inline char *FromWide (const wchar_t *wide)
     if (len == 0)
         return NULL;
 
-    char *out = malloc (len);
+    char *out = (char *)malloc (len);
 
     WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
     return out;
 }
 #endif
 
-
-#if !defined (__PLUGIN__)
-extern char *vlc_fix_readdir ( const char * );
-#endif
+VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
+VLC_INTERNAL( vlc_bool_t, vlc_current_charset, ( char ** ) );
 
 VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
 
-extern double i18n_strtod( const char *, char ** );
-extern double i18n_atof( const char * );
+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 * ) );
 
-# ifdef __cplusplus
-}
-# endif
-
 #endif