--- rxvt-unicode/src/xdefaults.C	2015/03/14 23:03:51	1.185
+++ rxvt-unicode/src/xdefaults.C	2015/06/16 11:58:26	1.189
@@ -203,6 +203,9 @@
 #if ENABLE_EWMH
               STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
 #endif
+#ifdef HAVE_XMU
+              RSTRG (Rs_pointerShape, "pointerShape", "string"),
+#endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
 #if ENABLE_STYLES
@@ -627,10 +630,9 @@
 
 /*}}} */
 
-#ifndef NO_RESOURCES
 /*----------------------------------------------------------------------*/
 
-# ifdef KEYSYM_RESOURCE
+#ifdef KEYSYM_RESOURCE
 static void
 rxvt_define_key (rxvt_term *term, const char *k, const char *v)
 {
@@ -777,8 +779,7 @@
   return 1;
 }
 
-# endif /* KEYSYM_RESOURCE */
-#endif /* NO_RESOURCES */
+#endif /* KEYSYM_RESOURCE */
 
 static char *
 get_res (XrmDatabase database, const char *program, const char *option)
@@ -862,11 +863,10 @@
 void
 rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
 {
-#ifndef NO_RESOURCES
   /*
    * [R5 or later]: enumerate the resource database
    */
-#  ifdef KEYSYM_RESOURCE
+#ifdef KEYSYM_RESOURCE
   void *closure[2] = {
     (void *)this,
     (void *)cb,
@@ -881,12 +881,12 @@
   class_prefix[1] = XrmStringToName ("Keysym");
   class_prefix[2] = NULLQUARK;
 
-#   ifdef RESFALLBACK
+# ifdef RESFALLBACK
   name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
-#   endif
+# endif
 
   name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
@@ -895,15 +895,15 @@
   name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
-#  endif
-
-#endif /* NO_RESOURCES */
+#endif
 }
 
 void
 rxvt_term::extract_keysym_resources ()
 {
+#ifdef KEYSYM_RESOURCE
   enumerate_keysym_resources (rxvt_define_key);
+#endif
 }
 
 /*----------------------- end-of-file (C source) -----------------------*/