From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 5 Mar 2006 15:32:49 +0000 (+0000)
Subject: - Call dgettext directly with shared libvlc and libtool
X-Git-Tag: 0.9.0-test0~12021
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5983a04266f532a7746388565834450cede596a1;p=vlc

- Call dgettext directly with shared libvlc and libtool
- Remove vlc_dcgettext in those cases
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b3561e6ad7..2c54cdba09 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1099,7 +1099,9 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_a
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
+#ifndef HAVE_SHARED_LIBVLC
 VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
+#endif
 
 #if defined( ENABLE_NLS ) && \
      (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 ) );
 #       include <libintl.h>
 #   endif
 #   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))
 #else
 #   define _(String) ((char*)(String))
diff --git a/src/extras/libc.c b/src/extras/libc.c
index e1b6a174f8..19fd2a384c 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -498,6 +498,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
 }
 #endif
 
+#ifndef HAVE_SHARED_LIBVLC
 /*****************************************************************************
  * dgettext: gettext for plugins.
  *****************************************************************************/
@@ -510,6 +511,7 @@ char *vlc_dgettext( const char *package, const char *msgid )
     return (char *)msgid;
 #endif
 }
+#endif
 
 /*****************************************************************************
  * count_utf8_string: returns the number of characters in the string.