aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/system.h10
2 files changed, 13 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4ab533d..2d0ae45 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-07 Alan Modra <amodra@gmail.com>
+
+ * system.h (textdomain, bindtextdomain): Use safer "do nothing".
+ (ngettext, dngettext, dcngettext): Define when !ENABLE_NLS.
+
2017-10-25 Alan Modra <amodra@gmail.com>
* symtab.cc (Symbol_table::add_from_relobj): Match "__gnu_lto_slim"
diff --git a/gold/system.h b/gold/system.h
index 5a3e001..1c21ee1 100644
--- a/gold/system.h
+++ b/gold/system.h
@@ -49,8 +49,14 @@
# define gettext(Msgid) (Msgid)
# define dgettext(Domainname, Msgid) (Msgid)
# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) do {} while (0) /* nothing */
-# define bindtextdomain(Domainname, Dirname) do {} 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