Skip to content

V
vlc-2-2
Commit 5ac87d09 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Always link libintl through libvlc on Win32

parent 18b4556f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
include/vlc_common.h
View file @ 5ac87d09
...@@ -1110,7 +1110,7 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a ...@@ -1110,7 +1110,7 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a
/***************************************************************************** /*****************************************************************************
* I18n stuff * I18n stuff
*****************************************************************************/ *****************************************************************************/
#ifndef HAVE_SHARED_LIBVLC #if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
#endif #endif
...@@ -1126,10 +1126,10 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); ...@@ -1126,10 +1126,10 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
# include <libintl.h> # include <libintl.h>
# endif # endif
# undef _ # undef _
# ifdef HAVE_SHARED_LIBVLC # if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
# define _(String) dgettext (PACKAGE_NAME, String) # define _(String) vlc_dgettext (PACKAGE_NAME, String)
# else # else
# define _(String) vlc_dgettext(PACKAGE_NAME, String) # define _(String) dgettext(PACKAGE_NAME, String)
# endif # endif
# define N_(String) ((char*)(String)) # define N_(String) ((char*)(String))
#else #else
......
src/extras/libc.c
View file @ 5ac87d09
...@@ -511,7 +511,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist, ...@@ -511,7 +511,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
} }
#endif #endif
#ifndef HAVE_SHARED_LIBVLC #if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
/***************************************************************************** /*****************************************************************************
* dgettext: gettext for plugins. * dgettext: gettext for plugins.
*****************************************************************************/ *****************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment