Commit e50e29c7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move vlc_iconv* to <vlc_charset.h>

parent 979ee1a3
......@@ -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 * ) );
......
......@@ -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)
......
......@@ -30,6 +30,7 @@
#endif
#include <vlc_common.h>
#include <vlc_charset.h>
#include "asf.h"
#include "buffer.h"
......
......@@ -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;
......
......@@ -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 */
......
......@@ -30,6 +30,7 @@
#endif
#include <vlc_common.h>
#include <vlc_charset.h>
#include <errno.h>
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_stream.h>
#include <vlc_charset.h>
struct stream_text_t
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment