--- rxvt-unicode/src/main.C	2005/12/18 00:59:42	1.149
+++ rxvt-unicode/src/main.C	2005/12/21 19:50:16	1.151
@@ -33,6 +33,8 @@
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
 
+#include <limits>
+
 #include <csignal>
 #include <cstring>
 
@@ -720,13 +722,13 @@
 
       if (flags & WidthValue)
         {
-          ncol = BOUND_POSITIVE_INT16 (w);
+          ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
       if (flags & HeightValue)
         {
-          nrow = BOUND_POSITIVE_INT16 (h);
+          nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
@@ -797,7 +799,7 @@
     }
   else
     {
-      MIN_IT (width, max_width);
+      min_it (width, max_width);
       szHint.width = szHint.base_width + width;
     }
 
@@ -808,7 +810,7 @@
     }
   else
     {
-      MIN_IT (height, max_height);
+      min_it (height, max_height);
       szHint.height = szHint.base_height + height;
     }
 
@@ -891,8 +893,6 @@
 
   fwidth  = prop.width;
   fheight = prop.height;
-  fweight = prop.weight;
-  fslant  = prop.slant;
   fbase   = (*fs)[1]->ascent;
 
   for (int style = 1; style < 4; style++)