--- rxvt-unicode/src/rxvt.h	2007/08/26 16:25:59	1.296
+++ rxvt-unicode/src/rxvt.h	2007/08/27 20:53:16	1.300
@@ -120,8 +120,6 @@
 void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
 void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
 
-int              rxvt_Str_match                   (const char *s1, const char *s2) NOTHROW;
-const char *     rxvt_Str_skip_space              (const char *str) NOTHROW;
 char           * rxvt_Str_trim                    (char *str) NOTHROW;
 int              rxvt_Str_escaped                 (char *str) NOTHROW;
 char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
@@ -133,7 +131,7 @@
 extern char **environ;
 extern char **rxvt_environ; // the original environ pointer
 
-inline void set_environ (stringvec *envv)
+static inline void set_environ (stringvec *envv)
 {
 #if ENABLE_PERL
   assert (envv);
@@ -143,7 +141,7 @@
     environ = (char **)envv->begin ();
 }
 
-inline void set_environ (char **envv)
+static inline void set_environ (char **envv)
 {
 #if ENABLE_PERL
   assert (envv);
@@ -698,11 +696,6 @@
 /* #define PrivMode_MouseX11Track       (1LU<<20) */
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11)
-#define PrivMode(test,bit)              \
-    if (test)                           \
-        priv_modes |= (bit);            \
-    else                                \
-        priv_modes &= ~(bit)
 
 #ifdef ALLOW_132_MODE
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
@@ -1399,6 +1392,14 @@
       options[opt >> 3] &= ~(1 << (opt & 7));
   }
 
+  void PrivMode (int set, unsigned bit) NOTHROW
+  {
+    if (set)
+      priv_modes |= bit;
+    else
+      priv_modes &= ~bit;
+  }
+
   void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
   int scr_scroll_text (int row1, int row2, int count) NOTHROW;