Quell some gcc warnings by defining textdomain and bindtextdomain

as intl/libgettext.h does.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7505d5631c2c74355815879a3653cbe060f09133..530dbb0ebb4ef3f02cbc8030c02287ca07636ec2 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-13  Alan Modra  <alan@linuxcare.com.au>
+
+       * 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  <hjl@gnu.org>
 
        * nlmconv.c (temp_filename): Removed.

diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index c6dc26a1f09f618845306cf9081df30b8be13c5e..e9d675e31ae1e4cc55b89f9062d6c091efcc9860 100644 (file)
--- 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 5a028e4df8d866f439f63e2ec829f505d168e6a5..237f8d413edfac998d63c65c92a650f533bf69cf 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-13  Alan Modra  <alan@linuxcare.com.au>
 
+       * 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 b733c85f0f3939441a97addab309e39694416804..6452989f2e77533b92dc1f58c1e70007b88a918b 100644 (file)
--- 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 474658cc388407c0d41d6e8ce9539168e691a37a..8a8f4f8e7f95be46f69b92d66de8a10913b74ce9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-13  Alan Modra  <alan@linuxcare.com.au>
+
+       * 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  <hjl@gnu.org>
 
        * ldlang.c (open_input_bfds): Don't load the same file within

diff --git a/ld/ld.h b/ld/ld.h
index e2052a0b445163efbc663796ca24caec79b4ed34..9f98e06846813260f0cf05f83cefc39002f52095 100644 (file)
--- 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