--- ray/src/rt/x11twind.c	1993/03/08 12:37:44	2.3
+++ ray/src/rt/x11twind.c	2003/04/11 16:01:26	2.7
@@ -1,9 +1,6 @@
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: x11twind.c,v 2.7 2003/04/11 16:01:26 greg Exp $";
 #endif
-
-/* Copyright (c) 1989 Regents of the University of California */
-
 /*
  *  x11twind.c - routines for X11 text windows.
  *
@@ -14,15 +11,18 @@ static char SCCSid[] = "$SunId$ LBL";
  *	9/26/88
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
 
+#include  <stdlib.h>
+
 #include  <X11/Xlib.h>
 
 #include  "x11twind.h"
 
 #ifndef  BSD
 #define  bzero(d,n)		(void)memset(d,0,n)
-extern char  *memset();
 #endif
 
 #define checkcurs(t)		if ((t)->cursor) togglecurs(t)
@@ -34,11 +34,9 @@ extern char  *memset();
 #define	Height(f)		((f)->ascent + (f)->descent)
 #define YStart(f)		((f)->ascent)
 
-extern	char  *calloc(), *malloc();
+static void  togglecurs();
 
-static  togglecurs();
 
-
 TEXTWIND *
 xt_open(dpy, parent, x, y, width, height, bw, fore, back, fontname)
 Display  *dpy;
@@ -90,21 +88,9 @@ char  *fontname;
 }
 
 
-xt_puts(s, t)				/* output a string */
-register char  *s;
-TEXTWIND  *t;
-{
-	int	oldcurs;
-
-	oldcurs = xt_cursor(t, TNOCURS);	/* for efficiency */
-	while (*s)
-		xt_putc(*s++, t);
-	xt_cursor(t, oldcurs);
-}
-
-
+void
 xt_putc(c, t)				/* output a character */
-char  c;
+int  c;
 register TEXTWIND  *t;
 {
 	checkcurs(t);
@@ -136,6 +122,21 @@ register TEXTWIND  *t;
 }
 
 
+void
+xt_puts(s, t)				/* output a string */
+register char  *s;
+TEXTWIND  *t;
+{
+	int	oldcurs;
+
+	oldcurs = xt_cursor(t, TNOCURS);	/* for efficiency */
+	while (*s)
+		xt_putc(*s++, t);
+	xt_cursor(t, oldcurs);
+}
+
+
+void
 xt_delete(t, r)				/* delete a line */
 register TEXTWIND  *t;
 int  r;
@@ -163,6 +164,7 @@ int  r;
 }
 
 
+void
 xt_insert(t, r)				/* insert a line */
 register TEXTWIND  *t;
 int  r;
@@ -189,6 +191,7 @@ int  r;
 }
 
 
+void
 xt_redraw(t)				/* redraw text window */
 register TEXTWIND  *t;
 {
@@ -204,6 +207,7 @@ register TEXTWIND  *t;
 }
 
 
+void
 xt_clear(t)				/* clear text window */
 register TEXTWIND  *t;
 {
@@ -217,6 +221,7 @@ register TEXTWIND  *t;
 }
 
 
+void
 xt_move(t, r, c)			/* move to new position */
 register TEXTWIND  *t;
 int  r, c;
@@ -247,6 +252,7 @@ register int  curs;
 }
 
 
+void
 xt_close(t)				/* close text window */
 register TEXTWIND  *t;
 {
@@ -257,12 +263,12 @@ register TEXTWIND  *t;
 	XDestroyWindow(t->dpy, t->w);
 	for (i = 0; i < t->nr; i++)
 		free(t->lp[i]);
-	free((char *)t->lp);
-	free((char *)t);
+	free((void *)t->lp);
+	free((void *)t);
 }
 
 
-static
+static void
 togglecurs(t)
 register TEXTWIND  *t;
 {