From 897083bdcd3240fe6b53fa7e91d500277d0e5172 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 13 May 2000 13:05:36 +0000 Subject: [PATCH] Quell some gcc warnings by defining textdomain and bindtextdomain as intl/libgettext.h does. --- binutils/ChangeLog | 6 ++++++ binutils/bucomm.h | 11 +++++------ gas/ChangeLog | 4 ++++ gas/asintl.h | 11 +++++------ ld/ChangeLog | 6 ++++++ ld/ld.h | 11 +++++------ 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 7505d5631c2..530dbb0ebb4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2000-05-13 Alan Modra + + * bucomm.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + 2000-05-12 H.J. Lu * nlmconv.c (temp_filename): Removed. diff --git a/binutils/bucomm.h b/binutils/bucomm.h index c6dc26a1f09..e9d675e31ae 100644 --- a/binutils/bucomm.h +++ b/binutils/bucomm.h @@ -138,12 +138,11 @@ void *alloca (); # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# 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 _(String) (String) # define N_(String) (String) #endif diff --git a/gas/ChangeLog b/gas/ChangeLog index 5a028e4df8d..237f8d413ed 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,9 @@ 2000-05-13 Alan Modra + * asintl.h (gettext, dgettext, dcgettext, textdomain, + bindtextdomain): Replace defines with those from intl/libgettext.h + to quieten gcc warnings. + * NEWS: Mention x86 .arch and -q. * config/tc-i386.c (quiet_warnings): New. diff --git a/gas/asintl.h b/gas/asintl.h index b733c85f0f3..6452989f2e7 100644 --- a/gas/asintl.h +++ b/gas/asintl.h @@ -33,12 +33,11 @@ # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# 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 _(String) (String) # define N_(String) (String) #endif diff --git a/ld/ChangeLog b/ld/ChangeLog index 474658cc388..8a8f4f8e7f9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2000-05-13 Alan Modra + + * ld.h (gettext, dgettext, dcgettext, textdomain, bindtextdomain): + Replace defines with those from intl/libgettext.h to quieten gcc + warnings. + 2000-05-10 H.J. Lu * ldlang.c (open_input_bfds): Don't load the same file within diff --git a/ld/ld.h b/ld/ld.h index e2052a0b445..9f98e068468 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -35,12 +35,11 @@ # define N_(String) (String) # endif #else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) +# 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 _(String) (String) # define N_(String) (String) #endif -- 2.30.2