diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2018-03-08 06:08:51 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2018-03-08 06:08:51 +0100 |
| commit | 334b94898112b5d2c7c97ff0496b9a67b3de0d26 (patch) | |
| tree | aa4e5b0897955f410016e01d68ba916abe6c1747 | |
| parent | doc: man page grammar (diff) | |
| download | gnupg2-334b94898112b5d2c7c97ff0496b9a67b3de0d26.tar.xz gnupg2-334b94898112b5d2c7c97ff0496b9a67b3de0d26.zip | |
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>
| -rw-r--r-- | g10/gpg.h | 4 | ||||
| -rw-r--r-- | g10/misc.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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> |