summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/runemacs.c2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32term.c2
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 <jasonr@gnu.org>
+
+ * emacsclient.c (w32_set_user_model_id): Use standard types.
+
2009-07-03 Eli Zaretskii <eliz@gnu.org>
* 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 <jasonr@gnu.org>
+
+ * runemacs.c (set_user_model_id): Use standard types.
+
2009-06-30 Jason Rumney <jasonr@gnu.org>
* 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 <jasonr@gnu.org>
+
+ * w32term.c (w32_initialize): Use standard types.
+
2009-07-03 Eli Zaretskii <eliz@gnu.org>
* 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;