*** nvi-1.81.5/cl/cl.h.orig	Sun Jul  8 06:06:11 2001
--- nvi-1.81.5/cl/cl.h	Sat Sep 16 12:32:05 2006
***************
*** 79,85 ****
  
  #define	CLP(sp)		((CL_PRIVATE *)((sp)->gp->cl_private))
  #define	GCLP(gp)	((CL_PRIVATE *)gp->cl_private)
! #define	CLSP(sp)	((WINDOW *)((sp)->cl_private))
  
  /* Return possibilities from the keyboard read routine. */
  typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;
--- 79,85 ----
  
  #define	CLP(sp)		((CL_PRIVATE *)((sp)->gp->cl_private))
  #define	GCLP(gp)	((CL_PRIVATE *)gp->cl_private)
! #define	CLSP(sp)	(((sp)->cl_private))
  
  /* Return possibilities from the keyboard read routine. */
  typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;
*** nvi-1.81.5/vi/v_txt.c.orig	Thu Jul 26 10:15:53 2001
--- nvi-1.81.5/vi/v_txt.c	Sat Sep 16 12:32:00 2006
***************
*** 589,595 ****
  
  	/* Check to see if the character fits into the replay buffers. */
  	if (LF_ISSET(TXT_RECORD)) {
! 		BINC_GOTO(sp, (char *)vip->rep,
  		    vip->rep_len, (rcol + 1) * sizeof(EVENT));
  		vip->rep[rcol++] = *evp;
  	}
--- 589,595 ----
  
  	/* Check to see if the character fits into the replay buffers. */
  	if (LF_ISSET(TXT_RECORD)) {
! 		BINC_GOTO(sp, vip->rep,
  		    vip->rep_len, (rcol + 1) * sizeof(EVENT));
  		vip->rep[rcol++] = *evp;
  	}
*** nvi-1.81.5/common/key.c.orig	Mon Jun 25 08:19:10 2001
--- nvi-1.81.5/common/key.c	Sat Sep 16 12:31:51 2006
***************
*** 833,839 ****
  	wp = sp->wp;
  	new_nelem = wp->i_nelem + add;
  	olen = wp->i_nelem * sizeof(wp->i_event[0]);
! 	BINC_RET(sp, (char *)wp->i_event, olen, new_nelem * sizeof(wp->i_event[0]));
  	wp->i_nelem = olen / sizeof(wp->i_event[0]);
  	return (0);
  }
--- 833,839 ----
  	wp = sp->wp;
  	new_nelem = wp->i_nelem + add;
  	olen = wp->i_nelem * sizeof(wp->i_event[0]);
! 	BINC_RET(sp, wp->i_event, olen, new_nelem * sizeof(wp->i_event[0]));
  	wp->i_nelem = olen / sizeof(wp->i_event[0]);
  	return (0);
  }
*** nvi-1.81.5/common/mem.h.orig	Sun Aug 20 02:12:59 2000
--- nvi-1.81.5/common/mem.h	Sat Sep 16 12:31:51 2006
***************
*** 27,33 ****
  }
  #define	BINC_GOTOW(sp, lp, llen, nlen) {					\
  	CHAR_T *L__bp = lp;						\
! 	BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))    	\
  }
  #define	BINC_RET(sp, lp, llen, nlen) {					\
  	char *L__p = lp;						\
--- 27,33 ----
  }
  #define	BINC_GOTOW(sp, lp, llen, nlen) {					\
  	CHAR_T *L__bp = lp;						\
! 	BINC_GOTO(sp, lp, llen, (nlen) * sizeof(CHAR_T))    	\
  }
  #define	BINC_RET(sp, lp, llen, nlen) {					\
  	char *L__p = lp;						\
***************
*** 44,50 ****
  }
  #define	BINC_RETW(sp, lp, llen, nlen) {					\
  	CHAR_T *L__bp = lp;						\
! 	BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))	    	\
  }
  
  /*
--- 44,50 ----
  }
  #define	BINC_RETW(sp, lp, llen, nlen) {					\
  	CHAR_T *L__bp = lp;						\
! 	BINC_RET(sp, lp, llen, (nlen) * sizeof(CHAR_T))	    	\
  }
  
  /*
***************
*** 67,73 ****
  }
  #define	GET_SPACE_GOTOW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  #define	GET_SPACE_RET(sp, bp, blen, nlen) {				\
  	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
--- 67,73 ----
  }
  #define	GET_SPACE_GOTOW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	GET_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  #define	GET_SPACE_RET(sp, bp, blen, nlen) {				\
  	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
***************
*** 84,90 ****
  }
  #define	GET_SPACE_RETW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  
  /*
--- 84,90 ----
  }
  #define	GET_SPACE_RETW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	GET_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  
  /*
***************
*** 104,110 ****
  }
  #define	ADD_SPACE_GOTOW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  #define	ADD_SPACE_RET(sp, bp, blen, nlen) {				\
  	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
--- 104,110 ----
  }
  #define	ADD_SPACE_GOTOW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	ADD_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  #define	ADD_SPACE_RET(sp, bp, blen, nlen) {				\
  	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
***************
*** 119,125 ****
  }
  #define	ADD_SPACE_RETW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  
  /* Free a GET_SPACE returned buffer. */
--- 119,125 ----
  }
  #define	ADD_SPACE_RETW(sp, bp, blen, nlen) {				\
  	CHAR_T *L__bp = bp;						\
! 	ADD_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T))	\
  }
  
  /* Free a GET_SPACE returned buffer. */
***************
*** 132,138 ****
  }
  #define	FREE_SPACEW(sp, bp, blen) {					\
  	CHAR_T *L__bp = bp;						\
! 	FREE_SPACE(sp, (char *)bp, blen);				\
  }
  
  /*
--- 132,138 ----
  }
  #define	FREE_SPACEW(sp, bp, blen) {					\
  	CHAR_T *L__bp = bp;						\
! 	FREE_SPACE(sp, bp, blen);				\
  }
  
  /*
*** nvi-1.81.5/common/db.c.orig	Sat Aug 18 14:52:00 2001
--- nvi-1.81.5/common/db.c	Sat Sep 16 12:31:51 2006
***************
*** 164,170 ****
  	nlen = 1024;
  retry:
  	/* data.size contains length in bytes */
! 	BINC_GOTO(sp, (char *)ep->c_lp, ep->c_blen, nlen);
  
  	/* Get the line from the underlying database. */
  	memset(&key, 0, sizeof(key));
--- 164,170 ----
  	nlen = 1024;
  retry:
  	/* data.size contains length in bytes */
! 	BINC_GOTO(sp, ep->c_lp, ep->c_blen, nlen);
  
  	/* Get the line from the underlying database. */
  	memset(&key, 0, sizeof(key));