X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fasintl.h;h=78ef197be24a33a367b7b5fd26cc6a768ada78b3;hb=07e7fdfd429985f061630c46e91cb10579607233;hp=67ce0dd4fd45a88569baf5a01d82d25f9788860e;hpb=a70c240376fbfde088944325cc58a0e9edba6cc5;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/asintl.h b/gas/asintl.h
index 67ce0dd4fd..78ef197be2 100644
--- a/gas/asintl.h
+++ b/gas/asintl.h
@@ -1,5 +1,5 @@
 /* asintl.h - gas-specific header for gettext code.
-   Copyright 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    Written by Tom Tromey <tromey@cygnus.com>
 
@@ -7,13 +7,13 @@
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
-   GAS is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GAS is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
@@ -25,7 +25,7 @@
    /* The Solaris version of locale.h always includes libintl.h.  If we have
       been configured with --disable-nls then ENABLE_NLS will not be defined
       and the dummy definitions of bindtextdomain (et al) below will conflict
-      with the defintions in libintl.h.  So we define these values to prevent
+      with the definitions in libintl.h.  So we define these values to prevent
       the bogus inclusion of libintl.h.  */
 #  define _LIBINTL_H
 #  define _LIBGETTEXT_H
@@ -45,8 +45,14 @@
 # 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