Move vlc_iconv* to <vlc_charset.h>

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index c79753cac5690a5ec17fb86bd7c4b8d61fb4f37e..55974a96da7f2782ceffa57b33bf6f35dc17004c 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -30,6 +30,12 @@
  * This files handles locale conversions in vlc
  */
 
+/* iconv wrappers (defined in src/extras/libc.c) */
+typedef void *vlc_iconv_t;
+VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) LIBVLC_USED );
+VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED );
+VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
+
 #include <stdarg.h>
 
 VLC_EXPORT( void, LocaleFree, ( const char * ) );

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 7e16c13d6978d3292c5f54429741aaeef04f1e63..8844d23ba3f4e1e876f57d5745ff56de585712e1 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -839,12 +839,6 @@ VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uin
 
 VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) LIBVLC_USED );
 
-/* iconv wrappers (defined in src/extras/libc.c) */
-typedef void *vlc_iconv_t;
-VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) LIBVLC_USED );
-VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED );
-VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
-
 /* execve wrapper (defined in src/extras/libc.c) */
 VLC_EXPORT( int, vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED );
 #define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)

diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c
index 31c56175d2680c497b340782adf78e33d21ce8c2..f80787a9b31bc5590dd9f8d2d5989dddc93c33b3 100644 (file)
--- a/modules/access/mms/buffer.c
+++ b/modules/access/mms/buffer.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_charset.h>
 
 #include "asf.h"
 #include "buffer.h"

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 5fe6276a17d03756348953bb023ae9cf7714004d..217a20552a6c767e22c904a1ef87a8061102f5c5 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -40,6 +40,7 @@
 #include <vlc_strings.h>
 #include <vlc_dialog.h>
 #include <vlc_memory.h>
+#include <vlc_charset.h>
 
 #include <math.h>
 
@@ -1110,7 +1111,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
         if( i_in_bytes )
         {
             msg_Warn( p_filter, "failed to convert string to unicode (%m), "
-                      "bytes left %u", (unsigned)i_in_bytes );
+                      "bytes left %zu", i_in_bytes );
             goto error;
         }
         *(uint32_t*)p_out_buffer = 0;

diff --git a/modules/misc/lua/libs/strings.c b/modules/misc/lua/libs/strings.c
index 7eb64133b897a81f9b8173b1ad39e862790ad095..94efa3630220fc540c16eaf7653f1b2f5d23fe14 100644 (file)
--- a/modules/misc/lua/libs/strings.c
+++ b/modules/misc/lua/libs/strings.c
@@ -37,6 +37,7 @@
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
 #include <vlc_aout.h>
+#include <vlc_charset.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/src/extras/libc.c b/src/extras/libc.c
index d9aad6b4ea418892310af830e49cbebe0edd4809..9912d4fe53723da10525a6befed9cc6b5b9231ad 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_charset.h>
 
 #include <errno.h>
 

diff --git a/src/input/stream.h b/src/input/stream.h
index 01610a8b3fe3fd0ea2f67fcf4d89250a7fdd607b..eb3dd2f2be069ed4bb7ee112bca2f25c17c1118e 100644 (file)
--- a/src/input/stream.h
+++ b/src/input/stream.h
@@ -31,6 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
+#include <vlc_charset.h>
 
 struct stream_text_t
 {