aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-19 11:25:43 +0300
committerEli Zaretskii2013-09-19 11:25:43 +0300
commit13d9698ae43a2b156a9081895293ae1b17b5f89e (patch)
treef937362ca1ee38cae2a18da9e86944a140bc82dc /src
parentced135ebdbfb0eea719ce165a454e7ff0b681e88 (diff)
downloademacs-13d9698ae43a2b156a9081895293ae1b17b5f89e.tar.gz
emacs-13d9698ae43a2b156a9081895293ae1b17b5f89e.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32reg.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d900818231e..ff5d265e51f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-09-19 Eli Zaretskii <eliz@gnu.org>
2
3 * w32reg.c (w32_get_string_resource): Make the first 2 arguments
4 'const char *' to avoid compiler warnings due to similar change in
5 the prototype of x_get_string_resource.
6
12013-09-19 Dmitry Antipov <dmantipov@yandex.ru> 72013-09-19 Dmitry Antipov <dmantipov@yandex.ru>
2 8
3 * xterm.h (struct x_display_info): New members last_mouse_glyph_frame, 9 * 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)
74} 74}
75 75
76static LPBYTE 76static LPBYTE
77w32_get_string_resource (char *name, char *class, DWORD dwexptype) 77w32_get_string_resource (const char *name, const char *class, DWORD dwexptype)
78{ 78{
79 LPBYTE lpvalue = NULL; 79 LPBYTE lpvalue = NULL;
80 HKEY hrootkey = NULL; 80 HKEY hrootkey = NULL;
@@ -92,7 +92,7 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
92 92
93 if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) 93 if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS)
94 { 94 {
95 char *keyname; 95 const char *keyname;
96 96
97 if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS 97 if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS
98 && dwType == dwexptype) 98 && dwType == dwexptype)