[git] GnuPG - branch, master, updated. gnupg-2.1.12-24-gf7426b7

[by Werner Koch]

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  f7426b73ce3176f2bd3ea02120be1c70d145542e (commit)
       via  9bbb841bd9ed2350299608b043cd144ff934815b (commit)
      from  b9d1e099c3ec3163c86afe627ecbe028db1facf6 (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 f7426b73ce3176f2bd3ea02120be1c70d145542e
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 13:02:14 2016 +0200

    common,w32: Silence an unused arg warning message.
    
    --

diff --git a/common/sysutils.c b/common/sysutils.c
index 18625d0..d82eb8e 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -636,6 +636,8 @@ int
 gnupg_chmod (const char *name, const char *modestr)
 {
 #ifdef HAVE_W32_SYSTEM
+  (void)name;
+  (void)modestr;
   return 0;
 #else
   return chmod (name, modestr_to_mode (modestr));

commit 9bbb841bd9ed2350299608b043cd144ff934815b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 24 13:01:27 2016 +0200

    gpg, w32: Fix build regression.
    
    --
    
    Fixes-commit: 754b1c463034a634a678d8efc76c27fd46aad9b9

diff --git a/g10/gpg.c b/g10/gpg.c
index f901bbd..a88499a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2046,7 +2046,9 @@ gpg_init_default_ctrl (ctrl_t ctrl)
 static void
 gpg_deinit_default_ctrl (ctrl_t ctrl)
 {
+#ifdef USE_TOFU
   tofu_closedbs (ctrl);
+#endif
   gpg_dirmngr_deinit_session_data (ctrl);
 }
 

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

Summary of changes:
 common/sysutils.c | 2 ++
 g10/gpg.c         | 2 ++
 2 files changed, 4 insertions(+)


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