Always link libintl through libvlc on Win32

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 461de6f86ba391f092e0c0786d2b228d7e87773a..a7ea304e089662df316f3955524125b0fe97c36c 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1110,7 +1110,7 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a
 /*****************************************************************************
  * 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
 
@@ -1126,10 +1126,10 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #       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

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 7410246276d9218b9579cc4cf6da367ca8181bc2..8b9f85d86d33d6eb034f151c7f1436673a7f4586 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -511,7 +511,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
 }
 #endif
 
-#ifndef HAVE_SHARED_LIBVLC
+#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
 /*****************************************************************************
  * dgettext: gettext for plugins.
  *****************************************************************************/