Commit 5983a042 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Call dgettext directly with shared libvlc and libtool

- Remove vlc_dcgettext in those cases
parent 6633a950
...@@ -1099,7 +1099,9 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a ...@@ -1099,7 +1099,9 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a
/***************************************************************************** /*****************************************************************************
* I18n stuff * I18n stuff
*****************************************************************************/ *****************************************************************************/
#ifndef 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
#if defined( ENABLE_NLS ) && \ #if defined( ENABLE_NLS ) && \
(defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\ (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\
...@@ -1113,7 +1115,11 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); ...@@ -1113,7 +1115,11 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
# include <libintl.h> # include <libintl.h>
# endif # endif
# undef _ # undef _
# define _(String) vlc_dgettext (PACKAGE_NAME, String) # ifdef HAVE_SHARED_LIBVLC
# define _(String) dgettext (PACKAGE_NAME, String)
# else
# define _(String) vlc_dgettext(PACKAGE_NAME, String)
# endif
# define N_(String) ((char*)(String)) # define N_(String) ((char*)(String))
#else #else
# define _(String) ((char*)(String)) # define _(String) ((char*)(String))
......
...@@ -498,6 +498,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist, ...@@ -498,6 +498,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
} }
#endif #endif
#ifndef HAVE_SHARED_LIBVLC
/***************************************************************************** /*****************************************************************************
* dgettext: gettext for plugins. * dgettext: gettext for plugins.
*****************************************************************************/ *****************************************************************************/
...@@ -510,6 +511,7 @@ char *vlc_dgettext( const char *package, const char *msgid ) ...@@ -510,6 +511,7 @@ char *vlc_dgettext( const char *package, const char *msgid )
return (char *)msgid; return (char *)msgid;
#endif #endif
} }
#endif
/***************************************************************************** /*****************************************************************************
* count_utf8_string: returns the number of characters in the string. * count_utf8_string: returns the number of characters in the string.
......
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