mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-04 22:57:47 +02:00
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: fd595c9d36
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
7e40c5efbe
commit
334b948981
|
@ -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
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user