diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 10 | ||||
| -rw-r--r-- | bfd/hosts/alphavms.h | 10 | ||||
| -rw-r--r-- | bfd/sysdep.h | 54 |
3 files changed, 51 insertions, 23 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2362ca0..705179a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2017-11-07 Alan Modra <amodra@gmail.com> + + * sysdep.h: Formatting, comment fixes. + (gettext, ngettext): Redefine when ENABLE_NLS. + (ngettext, dngettext, dcngettext): Define when !ENABLE_NLS. + (_): Define using gettext. + (textdomain, bindtextdomain): Use safer "do nothing". + * hosts/alphavms.h (textdomain, bindtextdomain): Likewise. + (ngettext, dngettext, dcngettext): Define when !ENABLE_NLS. + 2017-11-05 Alan Modra <amodra@gmail.com> PR 22397 diff --git a/bfd/hosts/alphavms.h b/bfd/hosts/alphavms.h index 3acdd51..9e61c45 100644 --- a/bfd/hosts/alphavms.h +++ b/bfd/hosts/alphavms.h @@ -56,7 +56,13 @@ extern char *stpcpy (char *, const char *); #define gettext(Msgid) (Msgid) #define dgettext(Domainname, Msgid) (Msgid) #define dcgettext(Domainname, Msgid, Category) (Msgid) -#define textdomain(Domainname) while (0) /* nothing */ -#define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +#define ngettext(Msgid1, Msgid2, n) \ + (n == 1 ? Msgid1 : Msgid2) +#define dngettext(Domainname, Msgid1, Msgid2, n) \ + (n == 1 ? Msgid1 : Msgid2) +#define dcngettext(Domainname, Msgid1, Msgid2, n, Category) \ + (n == 1 ? Msgid1 : Msgid2) +#define textdomain(Domainname) do {} while (0) +#define bindtextdomain(Domainname, Dirname) do {} while (0) #define _(String) (String) #define N_(String) (String) diff --git a/bfd/sysdep.h b/bfd/sysdep.h index 6906da9..596850a 100644 --- a/bfd/sysdep.h +++ b/bfd/sysdep.h @@ -181,31 +181,43 @@ size_t strnlen (const char *, size_t); #endif #ifdef ENABLE_NLS -#include <libintl.h> -/* Note the use of dgetext() and PACKAGE here, rather than gettext(). - - This is because the code in this directory is used to build a library which - will be linked with code in other directories to form programs. We want to - maintain a seperate translation file for this directory however, rather - than being forced to merge it with that of any program linked to libbfd. - This is a library, so it cannot depend on the catalog currently loaded. - - In order to do this, we have to make sure that when we extract messages we - use the OPCODES domain rather than the domain of the program that included - the bfd library, (eg OBJDUMP). Hence we use dgettext (PACKAGE, String) - and define PACKAGE to be 'bfd'. (See the code in configure). */ -#define _(String) dgettext (PACKAGE, String) -#ifdef gettext_noop -#define N_(String) gettext_noop (String) -#else -#define N_(String) (String) -#endif +# include <libintl.h> +/* Note the redefinition of gettext and ngettext here to use PACKAGE. + + This is because the code in this directory is used to build a + library which will be linked with code in other directories to form + programs. We want to maintain a seperate translation file for this + directory however, rather than being forced to merge it with that + of any program linked to libbfd. This is a library, so it cannot + depend on the catalog currently loaded. + + In order to do this, we have to make sure that when we extract + messages we use the BFD domain rather than the domain of the + program that included the bfd library, (eg OBJDUMP). Hence we use + dgettext (PACKAGE, String) and define PACKAGE to be 'bfd'. + (See the code in configure). */ +# undef gettext +# define gettext(Msgid) dgettext (PACKAGE, Msgid) +# undef ngettext +# define ngettext(Msgid1, Msgid2, n) dngettext (PACKAGE, Msgid1, Msgid2, n) +# define _(String) gettext (String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif #else # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +# define ngettext(Msgid1, Msgid2, n) \ + (n == 1 ? Msgid1 : Msgid2) +# define dngettext(Domainname, Msgid1, Msgid2, n) \ + (n == 1 ? Msgid1 : Msgid2) +# define dcngettext(Domainname, Msgid1, Msgid2, n, Category) \ + (n == 1 ? Msgid1 : Msgid2) +# define textdomain(Domainname) do {} while (0) +# define bindtextdomain(Domainname, Dirname) do {} while (0) # define _(String) (String) # define N_(String) (String) #endif |