X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/657d08d30a63536174fe9ec60b7f2cb8de541eb5..96c8b65ebd79360fdcf81786461805bb4377ca11:/src/w32reg.c

diff --git a/src/w32reg.c b/src/w32reg.c
index 1837443106..e7c4e9ea35 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-2011  Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993-1994, 2001-2013 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Written by Kevin Gallo */
 
 #include <config.h>
-#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"
 #include "blockinput.h"
@@ -85,7 +85,7 @@ 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 */
@@ -110,13 +110,13 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
 	}
 
       ok = (keyname
-	    && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL
+	    && (lpvalue = xmalloc (cbData)) != NULL
 	    && RegQueryValueEx (hrootkey, keyname, NULL, NULL, lpvalue, &cbData) == ERROR_SUCCESS);
 
       RegCloseKey (hrootkey);
     }
 
-  UNBLOCK_INPUT;
+  unblock_input ();
 
   if (!ok)
     {