commit 6472dfe337f8cc81c68ce903b81d7ec8a321369d
author Nick Wellnhofer <wellnhofer@aevum.de> Mon Oct 09 16:50:57 2017 +0200
committer Nick Wellnhofer <wellnhofer@aevum.de> Mon Oct 09 16:52:15 2017 +0200
tree b424269d7e74c9c0ab9f3e575328c616f0c1e626
parent 8575c1170b7ba14d0033a0e18bf5073a5616296d

Fix a couple of warnings in dict.c and threads.c

Only visible on Windows.

threads.c

diff --git a/threads.c b/threads.c
index 8860697..191f134 100644
--- a/threads.c
+++ b/threads.c
@@ -139,7 +139,7 @@
 static DWORD mainthread;
 static struct {
     DWORD done;
-    DWORD control;
+    LONG control;
 } run_once = { 0, 0};
 static volatile LPCRITICAL_SECTION global_init_lock = NULL;
 
@@ -439,7 +439,8 @@
 
         /* Swap it into the global_init_lock */
 #ifdef InterlockedCompareExchangePointer
-        InterlockedCompareExchangePointer(&global_init_lock, cs, NULL);
+        InterlockedCompareExchangePointer((void **) &global_init_lock,
+                                          cs, NULL);
 #else /* Use older void* version */
         InterlockedCompareExchange((void **) &global_init_lock,
                                    (void *) cs, NULL);
@@ -981,10 +982,12 @@
 #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
 #if defined(LIBXML_STATIC_FOR_DLL)
 BOOL XMLCALL
-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+xmlDllMain(ATTRIBUTE_UNUSED HINSTANCE hinstDLL, DWORD fdwReason,
+           ATTRIBUTE_UNUSED LPVOID lpvReserved)
 #else
 BOOL WINAPI
-DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+DllMain(ATTRIBUTE_UNUSED HINSTANCE hinstDLL, DWORD fdwReason,
+        ATTRIBUTE_UNUSED LPVOID lpvReserved)
 #endif
 {
     switch (fdwReason) {