From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 Nov 2019 09:53:02 +0000 (+0200)
Subject: Avoid compiler warnings in addpm.c and ddeclient.c
X-Git-Tag: emacs-27.0.90~691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=273604dd87f1955f2090650d2699b4ebfb322db8;p=emacs.git

Avoid compiler warnings in addpm.c and ddeclient.c

* nt/ddeclient.c (DdeCallback):
* nt/addpm.c (DdeCallback): Modify types of the last 2
arguments to avoid compiler warnings in 64-bit builds.
(Bug#38040)
---

diff --git a/nt/addpm.c b/nt/addpm.c
index a8bcd4a5c73..3fd1b1bdc0d 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -56,13 +56,13 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #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, DWORD_PTR,
+			       DWORD_PTR);
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
 	     HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
-	     DWORD dwData1, DWORD dwData2)
+	     DWORD_PTR dwData1, DWORD_PTR dwData2)
 {
   return ((HDDEDATA) NULL);
 }
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index e441700397d..81ae9491304 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -21,13 +21,13 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #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, DWORD_PTR,
+			       DWORD_PTR);
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
 	     HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
-	     DWORD dwData1, DWORD dwData2)
+	     DWORD_PTR dwData1, DWORD_PTR dwData2)
 {
   return ((HDDEDATA) NULL);
 }