--- rxvt-unicode/src/keyboard.C	2008/01/10 11:30:45	1.30
+++ rxvt-unicode/src/keyboard.C	2009/12/26 10:24:04	1.32
@@ -145,8 +145,8 @@
 compare_priority (keysym_t *a, keysym_t *b)
 {
   // (the more '1's in state; the less range): the greater priority
-  int ca = popcount (a->state /* & OtherModMask */);
-  int cb = popcount (b->state /* & OtherModMask */);
+  int ca = rxvt_popcount (a->state /* & OtherModMask */);
+  int cb = rxvt_popcount (b->state /* & OtherModMask */);
 
   if (ca != cb)
     return ca - cb;
@@ -428,7 +428,7 @@
 
   keymap.swap (sorted_keymap);
 
-#ifdef DEBUG_STRICT
+#ifndef NDEBUG
   // check for invariants
   for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
     {