Export utf8_vfprintf and utf8_fprintf

diff --git a/include/charset.h b/include/charset.h
index 9dd24389c6026fbbd47404f0ffe2835a95f86445..408733ecd06b65bf2c5b6a3ee3d69ab373ba8bc0 100644 (file)
--- a/include/charset.h
+++ b/include/charset.h
@@ -24,6 +24,8 @@
 #ifndef __VLC_CHARSET_H
 #define __VLC_CHARSET_H 1
 
+#include <stdarg.h>
+
 # ifdef __cplusplus
 extern "C" {
 # endif
@@ -42,9 +44,8 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, void *buf ) );
 VLC_EXPORT( int, utf8_lstat, ( const char *filename, void *buf ) );
 VLC_EXPORT( int, utf8_mkdir, ( const char *filename ) );
 
-#ifndef __PLUGIN__
-int utf8_fprintf( FILE *, const char *, ... );
-#endif
+VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
+VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) );
 
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
 VLC_EXPORT( const char *, IsUTF8, ( const char * ) );

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 023d4ed5433fa852e55ef67da9982b1d67e794cb..a4c0669b15469a89272b143dad0ee1b730e29a72 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -531,6 +531,8 @@ struct module_symbols_t
     void (*vlc_DictClear_inner) (dict_t *);
     dict_t * (*vlc_DictNew_inner) (void);
     playlist_item_t * (*playlist_GetPreferredNode_inner) (playlist_t *p_playlist, playlist_item_t *p_node);
+    int (*utf8_fprintf_inner) (FILE *, const char *, ...);
+    int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -997,6 +999,8 @@ struct module_symbols_t
 #  define vlc_DictClear (p_symbols)->vlc_DictClear_inner
 #  define vlc_DictNew (p_symbols)->vlc_DictNew_inner
 #  define playlist_GetPreferredNode (p_symbols)->playlist_GetPreferredNode_inner
+#  define utf8_fprintf (p_symbols)->utf8_fprintf_inner
+#  define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1466,6 +1470,8 @@ struct module_symbols_t
     ((p_symbols)->vlc_DictClear_inner) = vlc_DictClear; \
     ((p_symbols)->vlc_DictNew_inner) = vlc_DictNew; \
     ((p_symbols)->playlist_GetPreferredNode_inner) = playlist_GetPreferredNode; \
+    ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
+    ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
     (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \

diff --git a/src/misc/unicode.c b/src/misc/unicode.c
index 9dd49e4d1b3643e2f31cae92394ff3c0a646653f..e5db5797c139501969afc70938dbf67090c54b0c 100644 (file)
--- a/src/misc/unicode.c
+++ b/src/misc/unicode.c
@@ -556,7 +556,7 @@ static int utf8_vasprintf( char **str, const char *fmt, va_list ap )
     return res;
 }
 
-static int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
+int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
 {
     char *str;
     int res = utf8_vasprintf( &str, fmt, ap );