From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 12 Mar 2006 12:44:06 +0000 (+0000)
Subject: Always link libintl through libvlc on Win32
X-Git-Tag: 0.9.0-test0~11928
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5ac87d09be2b2a6e8384dc8af54516e3f4d190fb;p=vlc

Always link libintl through libvlc on Win32
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 461de6f86b..a7ea304e08 100644
--- 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 7410246276..8b9f85d86d 100644
--- 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.
  *****************************************************************************/