From a6ab35eee2d88fda9c3e0397504547f01c88bf5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 22 May 2008 22:32:30 +0300 Subject: [PATCH] Move _ and N_ to the right header --- include/vlc_common.h | 19 ------------------- include/vlc_fixups.h | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index ef59010854..7f53265c39 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -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 -# 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 *****************************************************************************/ diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index ea464a4fb4..f49a4267e0 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -1,8 +1,7 @@ /***************************************************************************** * 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 +# 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 */ -- 2.39.2