diff options
| author | Eli Zaretskii | 2019-11-09 11:53:02 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-11-09 11:53:02 +0200 |
| commit | 273604dd87f1955f2090650d2699b4ebfb322db8 (patch) | |
| tree | 5d6f507e603214422da5f0483f1e4a315e08370b | |
| parent | 4e4440272ece6d698d88af680d5c17ab322c7b64 (diff) | |
| download | emacs-273604dd87f1955f2090650d2699b4ebfb322db8.tar.gz emacs-273604dd87f1955f2090650d2699b4ebfb322db8.zip | |
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)
| -rw-r--r-- | nt/addpm.c | 6 | ||||
| -rw-r--r-- | nt/ddeclient.c | 6 |
2 files changed, 6 insertions, 6 deletions
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/>. */ | |||
| 56 | #include "../src/epaths.h" | 56 | #include "../src/epaths.h" |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD, | 59 | HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD_PTR, |
| 60 | DWORD); | 60 | DWORD_PTR); |
| 61 | 61 | ||
| 62 | HDDEDATA CALLBACK | 62 | HDDEDATA CALLBACK |
| 63 | DdeCallback (UINT uType, UINT uFmt, HCONV hconv, | 63 | DdeCallback (UINT uType, UINT uFmt, HCONV hconv, |
| 64 | HSZ hsz1, HSZ hsz2, HDDEDATA hdata, | 64 | HSZ hsz1, HSZ hsz2, HDDEDATA hdata, |
| 65 | DWORD dwData1, DWORD dwData2) | 65 | DWORD_PTR dwData1, DWORD_PTR dwData2) |
| 66 | { | 66 | { |
| 67 | return ((HDDEDATA) NULL); | 67 | return ((HDDEDATA) NULL); |
| 68 | } | 68 | } |
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/>. */ | |||
| 21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
| 22 | #include <stdio.h> | 22 | #include <stdio.h> |
| 23 | 23 | ||
| 24 | HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD, | 24 | HDDEDATA CALLBACK DdeCallback (UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD_PTR, |
| 25 | DWORD); | 25 | DWORD_PTR); |
| 26 | 26 | ||
| 27 | HDDEDATA CALLBACK | 27 | HDDEDATA CALLBACK |
| 28 | DdeCallback (UINT uType, UINT uFmt, HCONV hconv, | 28 | DdeCallback (UINT uType, UINT uFmt, HCONV hconv, |
| 29 | HSZ hsz1, HSZ hsz2, HDDEDATA hdata, | 29 | HSZ hsz1, HSZ hsz2, HDDEDATA hdata, |
| 30 | DWORD dwData1, DWORD dwData2) | 30 | DWORD_PTR dwData1, DWORD_PTR dwData2) |
| 31 | { | 31 | { |
| 32 | return ((HDDEDATA) NULL); | 32 | return ((HDDEDATA) NULL); |
| 33 | } | 33 | } |