--- rxvt-unicode/src/main.C	2005/12/21 14:19:19	1.150
+++ 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 = clamp (w, 0, MAX_POSITIVE_INT16);
+          ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
       if (flags & HeightValue)
         {
-          nrow = clamp (h, 0, MAX_POSITIVE_INT16);
+          nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
 
@@ -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++)