* src/alloc.c (mark_object): Revert part of last patch to use `switch'.

[gnu-emacs] / src / w32reg.c

diff --git a/src/w32reg.c b/src/w32reg.c
index e1465be9e44df605e98bf064a3dcd4b6b37a8403..ec251cfd8379389458338a32883ad7cda67e1e2a 100644 (file)
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,5 +1,5 @@
 /* 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-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -147,9 +147,9 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
     {
       char *resource;
 
-      if (resource = w32_get_rdb_resource (rdb, name))
+      if ((resource = w32_get_rdb_resource (rdb, name)))
         return resource;
-      if (resource = w32_get_rdb_resource (rdb, class))
+      if ((resource = w32_get_rdb_resource (rdb, class)))
         return resource;
     }
 
@@ -157,6 +157,5 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
     /* --quick was passed, so this is a no-op.  */
     return NULL;
 
-  return (w32_get_string_resource (name, class, REG_SZ));
+  return w32_get_string_resource (name, class, REG_SZ);
 }
-