[git] GnuPG - branch, master, updated. gnupg-2.1.6-7-gb3286af

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b3286af36d452fc801be573a057b0838d53a2edd (commit)
      from  67b2dc7636e47baefd5aafe0eb45b4730f974481 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3286af36d452fc801be573a057b0838d53a2edd
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jul 10 09:21:32 2015 +0900

    agent: Support non-NLS build.
    
    * agent/agent.h: Use ENABLE_NLS and define L_() macro.
    
    --
    
    GnuPG-bug-id: 2032
    
    This is a fix for e76d4c05b24211f3981ab69cddb3fccc17d21e0e.

diff --git a/agent/agent.h b/agent/agent.h
index 2948bff..5a09254 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -300,6 +300,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
 #define L_(a) agent_Lunderscore (ctrl, (a))
 #define LunderscorePROTO                                            \
   static inline const char *agent_Lunderscore (ctrl_t ctrl,         \
@@ -312,6 +313,9 @@ typedef int (*lookup_ttl_t)(const char *hexgrip);
     return ctrl? i18n_localegettext (ctrl->lc_messages, string) \
       /*     */: gettext (string);                              \
   }
+#else
+#define L_(a) (a)
+#endif
 
 
 /*-- gpg-agent.c --*/

-----------------------------------------------------------------------

Summary of changes:
 agent/agent.h | 4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org