TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify dxx_gettext when defined(USE_BUILTIN_ENGLISH_TEXT_STRINGS)

Browse source
This commit is contained in:
Kp 2020-12-27 22:03:09 +00:00
parent 8e76a5a064
commit 995e25f740
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/main/text.h
View file

@ -1285,17 +1285,26 @@ void load_text(void);
extern std::array<const char *, N_TEXT_STRINGS> Text_string;
#endif
static inline const char *dxx_gettext(unsigned expr, const char *fmt) __attribute_format_arg(2);
static inline const char *dxx_gettext(unsigned expr, const char *fmt)
{
#ifdef USE_BUILTIN_ENGLISH_TEXT_STRINGS
(void)expr;
return fmt;
/* Verify that A is convertible to the right type, then discard it.
*
* This path requires compiler support for statement expressions, since
* the expression must evaluate to the target string. For optimal
* format string checking, the target string must not be behind a
* function call, since that will convert the expression from
* `const char[]` to `const char *` and, for some versions of gcc,
* cause the string to be considered a non-literal, even if the input B
* is a literal.
*/
#define dxx_gettext(A,B) ({ unsigned dxx_gettext = A;(void)dxx_gettext; B; })
#else
(void)fmt;
__attribute_format_arg(2)
static constexpr const char *dxx_gettext(unsigned expr, const char *)
{
return Text_string[expr];
#endif
}
#endif
}
#endif