[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114392: Fix a compiler warning on MS-Windows due to
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r114392: Fix a compiler warning on MS-Windows due to recent changes. |
Date: |
Thu, 19 Sep 2013 08:26:19 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114392
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-19 11:25:43 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32reg.c w32reg.c-20091113204419-o5vbwnq5f7feedwu-948
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-19 07:48:53 +0000
+++ b/src/ChangeLog 2013-09-19 08:25:43 +0000
@@ -1,3 +1,9 @@
+2013-09-19 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* xterm.h (struct x_display_info): New members last_mouse_glyph_frame,
=== modified file 'src/w32reg.c'
--- a/src/w32reg.c 2013-09-17 12:27:21 +0000
+++ b/src/w32reg.c 2013-09-19 08:25:43 +0000
@@ -74,7 +74,7 @@
}
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 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114392: Fix a compiler warning on MS-Windows due to recent changes.,
Eli Zaretskii <=