security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

gpg: Fix build on Windows.

Browse Source 
--

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>
This commit is contained in:
NIIBE Yutaka 2018-03-08 14:08:51 +09:00
parent 7e40c5efbe
commit 334b948981
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/gpg.h
View File

@ -24,6 +24,10 @@
correct value and may be of advantage if we ever have to do correct value and may be of advantage if we ever have to do
special things. */ special things. */
#ifdef HAVE_W32_SYSTEM
# define WIN32_LEAN_AND_MEAN 1
#endif
#ifdef GPG_ERR_SOURCE_DEFAULT #ifdef GPG_ERR_SOURCE_DEFAULT
#error GPG_ERR_SOURCE_DEFAULT already defined #error GPG_ERR_SOURCE_DEFAULT already defined
#endif #endif

1
g10/misc.c
View File

@ -42,6 +42,7 @@
#include <time.h> #include <time.h>
#include <process.h> #include <process.h>
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
# define WIN32_LEAN_AND_MEAN 1
# include <winsock2.h> # include <winsock2.h>
#endif #endif
#include <windows.h> #include <windows.h>