From 874918ab915263b5e3de5ad6296045d936164542 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 15 Feb 2024 14:40:33 +0900
Subject: [PATCH] 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>
---
 common/dynload.h    | 11 +++++++----
 common/init.c       |  1 +
 dirmngr/certcache.c |  3 ++-
 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>