# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1246635122 0
# Node ID 7bad97f82eb6f574fb79c7b9432109752ca6946a
# Parent  23701e4011ccf9a08402216741642b76e957f976
* 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 -r 23701e4011cc -r 7bad97f82eb6 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Fri Jul 03 14:54:14 2009 +0000
+++ b/lib-src/ChangeLog	Fri Jul 03 15:32:02 2009 +0000
@@ -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 -r 23701e4011cc -r 7bad97f82eb6 lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Fri Jul 03 14:54:14 2009 +0000
+++ b/lib-src/emacsclient.c	Fri Jul 03 15:32:02 2009 +0000
@@ -396,7 +396,7 @@
 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 -r 23701e4011cc -r 7bad97f82eb6 nt/ChangeLog
--- a/nt/ChangeLog	Fri Jul 03 14:54:14 2009 +0000
+++ b/nt/ChangeLog	Fri Jul 03 15:32:02 2009 +0000
@@ -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 -r 23701e4011cc -r 7bad97f82eb6 nt/runemacs.c
--- a/nt/runemacs.c	Fri Jul 03 14:54:14 2009 +0000
+++ b/nt/runemacs.c	Fri Jul 03 15:32:02 2009 +0000
@@ -177,7 +177,7 @@
 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 -r 23701e4011cc -r 7bad97f82eb6 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 03 14:54:14 2009 +0000
+++ b/src/ChangeLog	Fri Jul 03 15:32:02 2009 +0000
@@ -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 -r 23701e4011cc -r 7bad97f82eb6 src/w32term.c
--- a/src/w32term.c	Fri Jul 03 14:54:14 2009 +0000
+++ b/src/w32term.c	Fri Jul 03 15:32:02 2009 +0000
@@ -6341,7 +6341,7 @@
 w32_initialize ()
 {
   HANDLE shell;
-  HRESULT (WINAPI * set_user_model) (PCWSTR);
+  HRESULT (WINAPI * set_user_model) (wchar_t * id);
 
   baud_rate = 19200;