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

Move _ and N_ to the right header

parent 59dec65d
......@@ -892,25 +892,6 @@ VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
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)||\
defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main)||\
defined(MODULE_NAME_IS_pda))
/* Declare nothing: gnome.h will do it for us */
#elif defined( ENABLE_NLS )
# include <libintl.h>
# undef _
# ifdef WIN32
# define _(String) vlc_dgettext (PACKAGE_NAME, String)
# else
# define _(String) dgettext(PACKAGE_NAME, String)
# endif
# define N_(String) (String)
#else
# define _(String) (String)
# define N_(String) (String)
#endif
/*****************************************************************************
* libvlc features
*****************************************************************************/
......
/*****************************************************************************
* fixups.h: portability fixups included from config.h
*****************************************************************************
* Copyright © 1998-2007 the VideoLAN project
* $Id$
* Copyright © 1998-2008 the VideoLAN project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -163,4 +162,20 @@ typedef void *locale_t;
# define freelocale( a ) (void)0
#endif
/* libintl support */
#define _(str) dgettext (PACKAGE_NAME, str)
#if defined (ENABLE_NLS)
# include <libintl.h>
# ifdef WIN32
# undef _
# define _(str) vlc_dgettext (PACKAGE_NAME, str)
# endif
#else
# define dgettext(dom, str) (str)
#endif
#define N_(str) gettext_noop (str)
#define gettext_noop(str) (str)
#endif /* !LIBVLC_FIXUPS_H */
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