--- rxvt-unicode/src/rxvt.h	2003/12/19 09:41:09	1.19
+++ rxvt-unicode/src/rxvt.h	2004/01/17 01:20:01	1.21
@@ -1,9 +1,5 @@
-/*
- * $Id: rxvt.h,v 1.19 2003/12/19 09:41:09 pcg Exp $
- */
-
-#ifndef _RXVT_H_                /* include once only */
-#define _RXVT_H_
+#ifndef RXVT_H_                /* include once only */
+#define RXVT_H_
 
 #include "rxvtlib.h"
 
@@ -887,7 +883,7 @@
 #endif
   short           rvideo;
   int16_t         num_scr;    /* screen: number lines scrolled             */
-  uint16_t        prev_ncol,   /* screen: previous number of columns        */
+  unsigned int    prev_ncol,  /* screen: previous number of columns        */
                   prev_nrow;  /* screen: previous number of rows           */
 #ifdef RXVT_GRAPHICS
   uint16_t        gr_prev_start;