* 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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index afc678c04344de2fdae5fce99a09dd37dc21417f..aa01d98aac2a9f4652573bd3f03cdf6f049258c7 100644 (file)
--- 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 5e6db54a90221a2664400e1d3eae50ab99eb76a2..8bc3b8a144e8c05616536a3052570d28c155dcbf 100644 (file)
--- 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 e4c95671aff9577b9962e2e6493846227d0dbe94..7843154f33fc0ebee1beb08844fe16bb8ece113f 100644 (file)
--- 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 aba1d439957bd80684b663868398b99b4acd0fb3..ab9620c0b0b7fedb7aac420244044d111e98bf31 100644 (file)
--- 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 3e3d431a65c2797676ca025e3ca46e785203196d..a74db6a266034d2dd2ddac4b30cef47e2643b049 100644 (file)
--- 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 c3cfc3411694f8354e7908edac8edf574217739f..dde006bbdef568805df4697f48138526da6a0af1 100644 (file)
--- 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;