--- rxvt-unicode/src/command.C	2011/04/30 13:11:34	1.487
+++ rxvt-unicode/src/command.C	2011/07/09 13:40:13	1.489
@@ -989,7 +989,7 @@
       scr_refresh ();
       scrollBar.show (1);
 #ifdef USE_XIM
-      IMSendSpot ();
+      im_send_spot ();
 #endif
     }
 
@@ -1738,7 +1738,7 @@
 #if USE_XIM
       if (Input_Context != NULL)
         {
-          IMSetPosition ();
+          im_set_position ();
           XSetICFocus (Input_Context);
         }
 #endif
@@ -2221,7 +2221,7 @@
 
   for (;;)
     {
-      if (expect_false (ch == NOCHAR))
+      if (ecb_unlikely (ch == NOCHAR))
         {
           seq_begin = cmdbuf_ptr;
           ch = next_char ();
@@ -2230,9 +2230,9 @@
             break;
         }
 
-      if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
+      if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
         {
-          if (expect_false (!seen_input))
+          if (ecb_unlikely (!seen_input))
             {
               seen_input = 1;
               // many badly-written programs (e.g. jed) contain a race condition:
@@ -2255,12 +2255,12 @@
 
           for (;;)
             {
-              if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
+              if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
                 break;
 
               *str++ = ch;
 
-              if (expect_false (ch == C0_LF || str >= eol))
+              if (ecb_unlikely (ch == C0_LF || str >= eol))
                 {
                   if (ch == C0_LF)
                     nlines++;
@@ -2348,7 +2348,7 @@
   while (cmdbuf_ptr < cmdbuf_endp)
     {
       // assume 7-bit to be ascii ALWAYS
-      if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
+      if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
         return *cmdbuf_ptr++;
 
       wchar_t wc;
@@ -2674,7 +2674,7 @@
       case C1_NEL:		/* ESC E */
         {
           wchar_t nlcr[] = { C0_LF, C0_CR };
-          scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
+          scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
         }
         break;
 
@@ -2860,8 +2860,8 @@
                 static const int pm_h[] = { 7, 25 };
                 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
 
-                process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
-                process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
+                process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
+                process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
               }
           break;
         }
@@ -3606,7 +3606,7 @@
 
 /* we're not using priv _yet_ */
 void
-rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
+rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
 {
   unsigned int i, j;
   int state;
@@ -3677,7 +3677,7 @@
       state = -1;
 
       /* basic handling */
-      for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
+      for (j = 0; j < ecb_array_length (argtopriv); j++)
         if (argtopriv[j].argval == arg[i])
           {
             state = privcases (mode, argtopriv[j].bit);