From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 19 Sep 2013 08:25:43 +0000 (+0300)
Subject: Fix a compiler warning on MS-Windows due to recent changes.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1517
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13d9698ae43a2b156a9081895293ae1b17b5f89e;p=emacs.git

Fix a compiler warning on MS-Windows due to recent changes.

 src/w32reg.c (w32_get_string_resource): Make the first 2 arguments
 'const char *' to avoid compiler warnings due to similar change in
 the prototype of x_get_string_resource.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d900818231e..ff5d265e51f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32reg.c (w32_get_string_resource): Make the first 2 arguments
+	'const char *' to avoid compiler warnings due to similar change in
+	the prototype of x_get_string_resource.
+
 2013-09-19  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* xterm.h (struct x_display_info): New members last_mouse_glyph_frame,
diff --git a/src/w32reg.c b/src/w32reg.c
index 9d088538e0b..c41675019dd 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -74,7 +74,7 @@ w32_get_rdb_resource (char *rdb, const char *resource)
 }
 
 static LPBYTE
-w32_get_string_resource (char *name, char *class, DWORD dwexptype)
+w32_get_string_resource (const char *name, const char *class, DWORD dwexptype)
 {
   LPBYTE lpvalue = NULL;
   HKEY hrootkey = NULL;
@@ -92,7 +92,7 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
 
   if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS)
     {
-      char *keyname;
+      const char *keyname;
 
       if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS
 	  && dwType == dwexptype)