mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
common,dirmngr:w32: Add include files.
* common/dynload.h: Include windows.h. Don't define RTLD_LAZY, if already defined. * common/init.c: Include wctype.h. * dirmngr/certcache.c: Include wincrypt.h. * dirmngr/dns-stuff.c: Include ws2tcpip.h. -- GnuPG-bug-id: 5894 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
27f66148f7
commit
874918ab91
@ -34,12 +34,15 @@
|
|||||||
#ifndef __MINGW32__
|
#ifndef __MINGW32__
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
#else
|
#else
|
||||||
# include <errhandlingapi.h>
|
# ifdef HAVE_WINSOCK2_H
|
||||||
# include <handleapi.h>
|
# include <winsock2.h>
|
||||||
# include <libloaderapi.h>
|
# endif
|
||||||
|
# include <windows.h>
|
||||||
# include "utf8conv.h"
|
# include "utf8conv.h"
|
||||||
# include "mischelp.h"
|
# include "mischelp.h"
|
||||||
# define RTLD_LAZY 0
|
# ifndef RTLD_LAZY
|
||||||
|
# define RTLD_LAZY 0
|
||||||
|
# endif
|
||||||
|
|
||||||
static inline void *
|
static inline void *
|
||||||
dlopen (const char *name, int flag)
|
dlopen (const char *name, int flag)
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
# include <winsock2.h>
|
# include <winsock2.h>
|
||||||
# endif
|
# endif
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
|
# include <wctype.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gcrypt.h>
|
#include <gcrypt.h>
|
||||||
|
@ -100,7 +100,8 @@ static unsigned int any_cert_of_class;
|
|||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
#ifdef HAVE_W32_SYSTEM
|
||||||
/* We load some functions dynamically. Provide typedefs for tehse
|
#include <wincrypt.h>
|
||||||
|
/* We load some functions dynamically. Provide typedefs for these
|
||||||
* functions. */
|
* functions. */
|
||||||
typedef HCERTSTORE (WINAPI *CERTOPENSYSTEMSTORE)
|
typedef HCERTSTORE (WINAPI *CERTOPENSYSTEMSTORE)
|
||||||
(HCRYPTPROV hProv, LPCSTR szSubsystemProtocol);
|
(HCRYPTPROV hProv, LPCSTR szSubsystemProtocol);
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
# ifdef HAVE_WINSOCK2_H
|
# ifdef HAVE_WINSOCK2_H
|
||||||
# include <winsock2.h>
|
# include <winsock2.h>
|
||||||
|
# include <ws2tcpip.h>
|
||||||
# endif
|
# endif
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
# include <iphlpapi.h>
|
# include <iphlpapi.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user