Changeset 5ac87d09be2b2a6e8384dc8af54516e3f4d190fb

Show
Ignore:
Timestamp:
03/12/06 13:44:06 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1142167446 +0000
git-parent:

[18b4556f857ff44bff4b3c45459ff42378481cd8]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1142167446 +0000
Message:

Always link libintl through libvlc on Win32

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_common.h

    r18b4556 r5ac87d0  
    11111111 * I18n stuff 
    11121112 *****************************************************************************/ 
    1113 #ifndef HAVE_SHARED_LIBVLC 
     1113#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC) 
    11141114VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); 
    11151115#endif 
    …… 
    11271127#   endif 
    11281128#   undef _ 
    1129 #   ifdef HAVE_SHARED_LIBVLC 
    1130 #       define _(String) dgettext (PACKAGE_NAME, String) 
     1129#   if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC) 
     1130#       define _(String) vlc_dgettext (PACKAGE_NAME, String) 
    11311131#   else 
    1132 #       define _(String) vlc_dgettext(PACKAGE_NAME, String) 
     1132#       define _(String) dgettext(PACKAGE_NAME, String) 
    11331133#   endif 
    11341134#   define N_(String) ((char*)(String)) 

  • src/extras/libc.c

    r6e14bd6 r5ac87d0  
    512512#endif 
    513513 
    514 #ifndef HAVE_SHARED_LIBVLC 
     514#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC) 
    515515/***************************************************************************** 
    516516 * dgettext: gettext for plugins.