--- rxvt-unicode/src/xdefaults.C 2015/05/11 22:05:48 1.186 +++ rxvt-unicode/src/xdefaults.C 2015/05/12 13:55:04 1.188 @@ -629,7 +629,7 @@ /*----------------------------------------------------------------------*/ -# ifdef KEYSYM_RESOURCE +#ifdef KEYSYM_RESOURCE static void rxvt_define_key (rxvt_term *term, const char *k, const char *v) { @@ -776,7 +776,7 @@ return 1; } -# endif /* KEYSYM_RESOURCE */ +#endif /* KEYSYM_RESOURCE */ static char * get_res (XrmDatabase database, const char *program, const char *option) @@ -863,7 +863,7 @@ /* * [R5 or later]: enumerate the resource database */ -# ifdef KEYSYM_RESOURCE +#ifdef KEYSYM_RESOURCE void *closure[2] = { (void *)this, (void *)cb, @@ -878,12 +878,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, @@ -892,13 +892,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 } void rxvt_term::extract_keysym_resources () { +#ifdef KEYSYM_RESOURCE enumerate_keysym_resources (rxvt_define_key); +#endif } /*----------------------- end-of-file (C source) -----------------------*/