From 334b94898112b5d2c7c97ff0496b9a67b3de0d26 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 8 Mar 2018 14:08:51 +0900
Subject: 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@fsij.org>
---
 g10/gpg.h  | 4 ++++
 g10/misc.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/g10/gpg.h b/g10/gpg.h
index 9b8b77ca0..1bad5515a 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 77c8f269c..97809692e 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>
-- 
cgit v1.2.3