Merge from origin/emacs-25

[gnu-emacs] / nt / runemacs.c

diff --git a/nt/runemacs.c b/nt/runemacs.c
index 2685b25c30da5aed496f2a7bd982cc97f6bfaf6e..9edf148348e3ace290f2144722f1959153c3714a 100644 (file)
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -6,8 +6,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -203,7 +203,7 @@ void
 set_user_model_id (void)
 {
   HMODULE shell;
-  HRESULT (WINAPI * set_user_model) (wchar_t * id);
+  HRESULT (WINAPI * set_user_model) (const wchar_t * id);
 
   /* On Windows 7 and later, we need to set the user model ID
      to associate emacsclient launched files with Emacs frames