[vlc-commits] commit: Move vlc_iconv* to <vlc_charset.h> ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 26 20:11:35 2010 +0300| [e50e29c7508b795178ea004a08005b3e326421f0] | committer: Rémi Denis-Courmont 

Move vlc_iconv* to <vlc_charset.h>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e50e29c7508b795178ea004a08005b3e326421f0
---

 include/vlc_charset.h           |    6 ++++++
 include/vlc_common.h            |    6 ------
 modules/access/mms/buffer.c     |    1 +
 modules/misc/freetype.c         |    3 ++-
 modules/misc/lua/libs/strings.c |    1 +
 src/extras/libc.c               |    1 +
 src/input/stream.h              |    1 +
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index c79753c..55974a9 100644
--- 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 7e16c13..8844d23 100644
--- 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 31c5617..f80787a 100644
--- 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 5fe6276..217a205 100644
--- 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 7eb6413..94efa36 100644
--- 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 d9aad6b..9912d4f 100644
--- 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 01610a8..eb3dd2f 100644
--- 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
 {