[Pkg-gnupg-commit] [gnupg2] 11/30: agent: Fix string translation for Windows

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 6158811304937b592601ef30c29c5a5cdbaa88ea
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 23 11:02:28 2017 +0200

    agent: Fix string translation for Windows
    
    * agent/agent.h (L_): Define agent_Lunderscore when simple
    gettext is used.
    
    --
    This fixes a regression introduced by b3286af3 ENABLE_NLS
    is not defined if we use simple gettext and not gettext.
    
    GnuPG-Bug-Id: T3364
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
---
 agent/agent.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/agent.h b/agent/agent.h
index 815d9a5..f5df75e 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -320,7 +320,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip);
    and uses that to translate a string according to the locale set for
    the connection.  The macro LunderscoreIMPL is used by i18n to
    actually define the inline function when needed.  */
-#ifdef ENABLE_NLS
+#if defined (ENABLE_NLS) || defined (USE_SIMPLE_GETTEXT)
 #define L_(a) agent_Lunderscore (ctrl, (a))
 #define LunderscorePROTO                                            \
   static inline const char *agent_Lunderscore (ctrl_t ctrl,         \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git