backport [16453] -> this should fix macosx/win32 builds.

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 * ) );

include/vlc_symbols.h

@@ -493,6 +493,8 @@ struct module_symbols_t
     char * (*encode_URI_component_inner) (const char *psz);
     size_t (*vlc_strlcpy_inner) (char *, const char *, size_t);
     vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
+    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
@@ -966,6 +968,8 @@ struct module_symbols_t
 #  define encode_URI_component (p_symbols)->encode_URI_component_inner
 #  define vlc_strlcpy (p_symbols)->vlc_strlcpy_inner
 #  define input_AddSubtitles (p_symbols)->input_AddSubtitles_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.
@@ -1442,6 +1446,8 @@ struct module_symbols_t
     ((p_symbols)->encode_URI_component_inner) = encode_URI_component; \
     ((p_symbols)->vlc_strlcpy_inner) = vlc_strlcpy; \
     ((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
+    ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
+    ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__stats_CounterGet_deprecated = NULL; \
     (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \

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 );