[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-9-g334b948

[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, STABLE-BRANCH-2-2 has been updated
       via  334b94898112b5d2c7c97ff0496b9a67b3de0d26 (commit)
      from  7e40c5efbea65c7804b06d62dfcd7f991557bfaa (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 334b94898112b5d2c7c97ff0496b9a67b3de0d26
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 8 14:08:51 2018 +0900

    gpg: Fix build on Windows.
    
    --
    
    WIN32_LEAN_AND_MEAN is required to avoid definitions of grp1, grp2,
    and grp3 in dlgs.h, which is included by windows.h.
    
    Fixes-commit: fd595c9d3642dba437fbe0f6e25d7aaaae095f94
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/gpg.h b/g10/gpg.h
index 9b8b77c..1bad551 100644
--- a/g10/gpg.h
+++ b/g10/gpg.h
@@ -24,6 +24,10 @@
    correct value and may be of advantage if we ever have to do
    special things. */
 
+#ifdef HAVE_W32_SYSTEM
+# define WIN32_LEAN_AND_MEAN 1
+#endif
+
 #ifdef GPG_ERR_SOURCE_DEFAULT
 #error GPG_ERR_SOURCE_DEFAULT already defined
 #endif
diff --git a/g10/misc.c b/g10/misc.c
index 77c8f26..9780969 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -42,6 +42,7 @@
 #include <time.h>
 #include <process.h>
 #ifdef HAVE_WINSOCK2_H
+# define WIN32_LEAN_AND_MEAN 1
 # include <winsock2.h>
 #endif
 #include <windows.h>

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

Summary of changes:
 g10/gpg.h  | 4 ++++
 g10/misc.c | 1 +
 2 files changed, 5 insertions(+)


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