From 824f8363af7761c5995cc44c029bcd29da4b5694 Mon Sep 17 00:00:00 2001 From: Iris Morelle Date: Fri, 23 Mar 2018 03:51:21 -0300 Subject: [PATCH] i18n: Make VGETTEXT()/VNGETTEXT() always require a GETTEXT_DOMAIN to be defined This drops a preprocessor conditional branch that is dead code now that the file pulls gettext.hpp and the GETTEXT_DOMAIN defaults with it. See also PR #2711. (cherry-picked from commit a60239116863ea7592d27f2819017b57a34e0ce5) --- src/formula/string_utils.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/formula/string_utils.hpp b/src/formula/string_utils.hpp index 7c8a4908b456..e00e8967274f 100644 --- a/src/formula/string_utils.hpp +++ b/src/formula/string_utils.hpp @@ -94,10 +94,5 @@ std::string vngettext(const char*, const char*, const char*, int, const utils::s * the function. */ -#ifdef GETTEXT_DOMAIN #define VGETTEXT(msgid, ...) vgettext(GETTEXT_DOMAIN, msgid, __VA_ARGS__) #define VNGETTEXT(msgid, msgid_plural, count, ...) vngettext(GETTEXT_DOMAIN, msgid, msgid_plural, count, __VA_ARGS__) -#else -#define VGETTEXT(msgid, ...) vgettext(msgid, __VA_ARGS__) -#define VNGETTEXT(msgid, msgid_plural, count, ...) vngettext(msgid, msgid_plural, count, __VA_ARGS__) -#endif