diff options
| author | NIIBE Yutaka <[email protected]> | 2024-02-15 05:40:33 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-02-15 05:40:33 +0000 |
| commit | 874918ab915263b5e3de5ad6296045d936164542 (patch) | |
| tree | cd44183c53ecf12789433e8800f5d604bdc44213 | |
| parent | dirmngr:w32: Add include files. (diff) | |
| download | gnupg-874918ab915263b5e3de5ad6296045d936164542.tar.gz gnupg-874918ab915263b5e3de5ad6296045d936164542.zip | |
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 <[email protected]>
| -rw-r--r-- | common/dynload.h | 11 | ||||
| -rw-r--r-- | common/init.c | 1 | ||||
| -rw-r--r-- | dirmngr/certcache.c | 3 | ||||
| -rw-r--r-- | dirmngr/dns-stuff.c | 1 |
4 files changed, 11 insertions, 5 deletions
diff --git a/common/dynload.h b/common/dynload.h index 6ac7b4e17..af3906c81 100644 --- a/common/dynload.h +++ b/common/dynload.h @@ -34,12 +34,15 @@ #ifndef __MINGW32__ # include <dlfcn.h> #else -# include <errhandlingapi.h> -# include <handleapi.h> -# include <libloaderapi.h> +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif +# include <windows.h> # include "utf8conv.h" # include "mischelp.h" -# define RTLD_LAZY 0 +# ifndef RTLD_LAZY +# define RTLD_LAZY 0 +# endif static inline void * dlopen (const char *name, int flag) diff --git a/common/init.c b/common/init.c index 62a48f8c7..8ea51c8b0 100644 --- a/common/init.c +++ b/common/init.c @@ -37,6 +37,7 @@ # include <winsock2.h> # endif # include <windows.h> +# include <wctype.h> #endif #include <gcrypt.h> diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 6b194f31c..b7b5b3d15 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -100,7 +100,8 @@ static unsigned int any_cert_of_class; #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. */ typedef HCERTSTORE (WINAPI *CERTOPENSYSTEMSTORE) (HCRYPTPROV hProv, LPCSTR szSubsystemProtocol); diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c index 0edbc0442..270717215 100644 --- a/dirmngr/dns-stuff.c +++ b/dirmngr/dns-stuff.c @@ -34,6 +34,7 @@ # define WIN32_LEAN_AND_MEAN # ifdef HAVE_WINSOCK2_H # include <winsock2.h> +# include <ws2tcpip.h> # endif # include <windows.h> # include <iphlpapi.h> |