Subject: bug#38040: Compiler warnings on win32 build

From: Cecilio Pardo <[email-masked]>
Date: Sun, 03 Nov 2019 01:36:41 +0100

Severity: wishlist
Tags: patch

Building with mingw64, there are a couple of warnings about wrong data
types that can be avoided:

diff --git a/nt/addpm.c b/nt/addpm.c
index a8bcd4a5c7..ff169f7d87 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -56,13 +56,13 @@ #define COBJMACROS 1
 #include "../src/epaths.h"
 #endif
 
-HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD,
-			       DWORD);
+HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, ULONG_PTR,
+			       ULONG_PTR);
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
 	     HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
-	     DWORD dwData1, DWORD dwData2)
+	     ULONG_PTR dwData1, ULONG_PTR dwData2)
 {
   return ((HDDEDATA) NULL);
 }
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index e441700397..a63be13f75 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -21,13 +21,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD,
-			       DWORD);
+HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, ULONG_PTR,
+			       ULONG_PTR);
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
 	     HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
-	     DWORD dwData1, DWORD dwData2)
+	     ULONG_PTR dwData1, ULONG_PTR dwData2)
 {
   return ((HDDEDATA) NULL);
 }