1
0
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:
NIIBE Yutaka 2024-02-15 14:40:33 +09:00
parent 27f66148f7
commit 874918ab91
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
4 changed files with 11 additions and 5 deletions

View File

@ -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)

View File

@ -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>

View File

@ -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);

View File

@ -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>