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

2 files changed, 5 insertions, 1 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