From 0a3472c7b938d9469e9c4b304798c7eacf8b3330 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 3 Jul 2009 15:32:02 +0000 Subject: [PATCH] * w32term.c (w32_initialize): Use standard types. * runemacs.c (set_user_model_id): Use standard types. * emacsclient.c (w32_set_user_model_id): Use standard types. --- lib-src/ChangeLog | 4 ++++ lib-src/emacsclient.c | 2 +- nt/ChangeLog | 4 ++++ nt/runemacs.c | 2 +- src/ChangeLog | 4 ++++ src/w32term.c | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index afc678c0434..aa01d98aac2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Jason Rumney + + * emacsclient.c (w32_set_user_model_id): Use standard types. + 2009-07-03 Eli Zaretskii * makefile.w32-in (WINNT_SUPPORT): Add common-win.elc, like diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 5e6db54a902..8bc3b8a144e 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -396,7 +396,7 @@ void w32_set_user_model_id () { HMODULE shell; - HRESULT (WINAPI * set_user_model) (PWCSTR); + HRESULT (WINAPI * set_user_model) (wchar_t * id); /* On Windows 7 and later, we need to set the user model ID to associate emacsclient launched files with Emacs frames diff --git a/nt/ChangeLog b/nt/ChangeLog index e4c95671aff..7843154f33f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Jason Rumney + + * runemacs.c (set_user_model_id): Use standard types. + 2009-06-30 Jason Rumney * runemacs.c (set_user_model_id): New function. diff --git a/nt/runemacs.c b/nt/runemacs.c index aba1d439957..ab9620c0b0b 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -177,7 +177,7 @@ error: void set_user_model_id () { HMODULE shell; - HRESULT (WINAPI * set_user_model) (PCWSTR); + HRESULT (WINAPI * set_user_model) (wchar_t * id); /* On Windows 7 and later, we need to set the user model ID to associate emacsclient launched files with Emacs frames diff --git a/src/ChangeLog b/src/ChangeLog index 3e3d431a65c..a74db6a2660 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Jason Rumney + + * w32term.c (w32_initialize): Use standard types. + 2009-07-03 Eli Zaretskii * dired.c (Ffile_attributes): Decode user and group names by the diff --git a/src/w32term.c b/src/w32term.c index c3cfc341169..dde006bbdef 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6341,7 +6341,7 @@ static void w32_initialize () { HANDLE shell; - HRESULT (WINAPI * set_user_model) (PCWSTR); + HRESULT (WINAPI * set_user_model) (wchar_t * id); baud_rate = 19200; -- 2.39.2