Sync with 2.33.8

[thirdparty/git.git] / gettext.h

diff --git a/gettext.h b/gettext.h
index b96ab9d3403481b2c585db0a259f24b15724590a..484cafa5628850930f8536c6c4e79fb26847153d 100644 (file)
--- a/gettext.h
+++ b/gettext.h
@@ -28,8 +28,6 @@
 
 #define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
 
-int use_gettext_poison(void);
-
 #ifndef NO_GETTEXT
 extern int git_gettext_enabled;
 void git_setup_gettext(void);
@@ -38,7 +36,6 @@ int gettext_width(const char *s);
 #define git_gettext_enabled (0)
 static inline void git_setup_gettext(void)
 {
-       use_gettext_poison(); /* getenv() reentrancy paranoia */
 }
 static inline int gettext_width(const char *s)
 {
@@ -50,46 +47,21 @@ static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
 {
        if (!*msgid)
                return "";
-       return use_gettext_poison() ? "# GETTEXT POISON #" :
-               !git_gettext_enabled ? msgid : gettext(msgid);
+       if (!git_gettext_enabled)
+               return msgid;
+       return gettext(msgid);
 }
 
 static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2)
 const char *Q_(const char *msgid, const char *plu, unsigned long n)
 {
-       if (use_gettext_poison())
-               return "# GETTEXT POISON #";
        if (!git_gettext_enabled)
                return n == 1 ? msgid : plu;
        return ngettext(msgid, plu, n);
 }
 
 /* Mark msgid for translation but do not translate it. */
-#if !USE_PARENS_AROUND_GETTEXT_N
 #define N_(msgid) msgid
-#else
-/*
- * Strictly speaking, this will lead to invalid C when
- * used this way:
- *     static const char s[] = N_("FOO");
- * which will expand to
- *     static const char s[] = ("FOO");
- * and in valid C, the initializer on the right hand side must
- * be without the parentheses.  But many compilers do accept it
- * as a language extension and it will allow us to catch mistakes
- * like:
- *     static const char *msgs[] = {
- *             N_("one")
- *             N_("two"),
- *             N_("three"),
- *             NULL
- *     };
- * (notice the missing comma on one of the lines) by forcing
- * a compilation error, because parenthesised ("one") ("two")
- * will not get silently turned into ("onetwo").
- */
-#define N_(msgid) (msgid)
-#endif
 
 const char *get_preferred_languages(void);
 int is_utf8_locale(void);