--- rxvt-unicode/src/init.C	2005/12/18 00:59:42	1.122
+++ rxvt-unicode/src/init.C	2005/12/21 19:50:16	1.125
@@ -36,6 +36,8 @@
 #include "rxvtutil.h"
 #include "init.h"
 
+#include <limits>
+
 #include <csignal>
 
 const char *const def_colorName[] =
@@ -371,15 +373,17 @@
     }
 
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
-    saveLines = BOUND_POSITIVE_INT16 (i);
+    saveLines = min (i, std::numeric_limits<int16_t>::max ());
 
 #if ENABLE_FRILLS
   if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
-    int_bwidth = min (i, 100);    /* arbitrary limit */
+    int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
+
   if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
-    ext_bwidth = min (i, 100);    /* arbitrary limit */
+    ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
+
   if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
-    lineSpace = min (i, 100);     /* arbitrary limit */
+    lineSpace = min (i, std::numeric_limits<int16_t>::max ());
 #endif
 
 #ifdef POINTER_BLANK
@@ -460,7 +464,7 @@
 #ifndef XTERM_REVERSE_VIDEO
   /* this is how we implement reverseVideo */
   if (options & Opt_reverseVideo)
-    SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
+    ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
 #endif
 
   /* convenient aliases for setting fg/bg to colors */
@@ -523,7 +527,7 @@
    * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
   for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
     ;
-  MAX_IT (i, 1);
+  max_it (i, 1);
   env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
 
   sprintf (env_windowid, "WINDOWID=%u",