Commit b2940c86 authored by Sam Hocevar's avatar Sam Hocevar

* ./include/vlc_common.h: removed duplicate macro definitions in the gtk

    and gnome plugins.
parent f134c067
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.49 2003/01/27 22:42:36 sam Exp $
* $Id: vlc_common.h,v 1.50 2003/01/28 03:11:02 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -647,7 +647,12 @@ typedef __int64 off_t;
*****************************************************************************/
VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
#if defined( ENABLE_NLS ) && defined( HAVE_INCLUDED_GETTEXT )
#if defined( ENABLE_NLS ) && \
(defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gtk) \
||defined(MODULE_NAME_IS_gnome_main)||defined(MODULE_NAME_IS_gtk_main) \
||defined(MODULE_NAME_IS_familiar))
/* Declare nothing: gtk.h will do it for us */
#elif defined( ENABLE_NLS ) && defined( HAVE_INCLUDED_GETTEXT )
# include "libintl.h"
# undef _
# define _(String) vlc_dgettext (PACKAGE, String)
......@@ -657,7 +662,7 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
# undef _
# define _(String) dgettext (PACKAGE, String)
# define N_(String) ((char*)(String))
#elif !defined( NEED_GNOMESUPPORT_H )
#else
# define _(String) ((char*)(String))
# define N_(String) ((char*)(String))
#endif
......
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