X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/23f86fce48e1cc8118f0ea5cce49d1acfd4364c4..cbeeab2eab5d53f0fba452d4790d7a58071605e2:/src/w32reg.c
diff --git a/src/w32reg.c b/src/w32reg.c
index 9c727ae5ab..261cfcd09d 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,5 +1,6 @@
/* Emulate the X Resource Manager through the registry.
- Copyright (C) 1990, 1993-1994, 2001-2012 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1993-1994, 2001-2015 Free Software Foundation,
+ Inc.
This file is part of GNU Emacs.
@@ -19,7 +20,6 @@ along with GNU Emacs. If not, see . */
/* Written by Kevin Gallo */
#include
-#include
#include "lisp.h"
#include "w32term.h"
#include "blockinput.h"
@@ -56,7 +56,7 @@ along with GNU Emacs. If not, see . */
*/
static char *
-w32_get_rdb_resource (char *rdb, char *resource)
+w32_get_rdb_resource (char *rdb, const char *resource)
{
char *value = rdb;
int len = strlen (resource);
@@ -74,7 +74,7 @@ w32_get_rdb_resource (char *rdb, 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;
@@ -85,14 +85,14 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
trykey:
- BLOCK_INPUT;
+ block_input ();
/* Check both the current user and the local machine to see if we have
any resources */
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)
@@ -116,7 +116,7 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
RegCloseKey (hrootkey);
}
- UNBLOCK_INPUT;
+ unblock_input ();
if (!ok)
{
@@ -141,7 +141,7 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
database RDB. */
char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
{
if (rdb)
{