/* 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 * ) );
-VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, char **, size_t *, char **, size_t * ) );
+VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) );
VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
/* execve wrapper (defined in src/extras/libc.c) */
/*****************************************************************************
* I18n stuff
*****************************************************************************/
-#ifndef HAVE_SHARED_LIBVLC
+#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
#endif
# include <libintl.h>
# endif
# undef _
-# ifdef HAVE_SHARED_LIBVLC
-# define _(String) dgettext (PACKAGE_NAME, String)
+# if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
+# define _(String) vlc_dgettext (PACKAGE_NAME, String)
# else
-# define _(String) vlc_dgettext(PACKAGE_NAME, String)
+# define _(String) dgettext(PACKAGE_NAME, String)
# endif
# define N_(String) ((char*)(String))
#else