--- ray/src/px/ximage.c	1998/10/27 09:08:28	2.8
+++ ray/src/px/ximage.c	2003/04/23 00:52:34	2.10
@@ -1,9 +1,6 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: ximage.c,v 2.10 2003/04/23 00:52:34 greg Exp $";
 #endif
-
 /*
  *  ximage.c - driver for X-windows
  *
@@ -21,6 +18,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <ctype.h>
 
+#include  <time.h>
+
 #include  "color.h"
 
 #include  "resolu.h"
@@ -86,13 +85,7 @@ char  *progname;
 
 char  errmsg[128];
 
-extern long  ftell();
 
-extern char  *malloc(), *calloc();
-
-extern double  pow(), log();
-
-
 main(argc, argv)
 int  argc;
 char  *argv[];
@@ -253,6 +246,7 @@ char  *err;
 }
 
 
+void
 eputs(s)
 char	*s;
 {
@@ -260,6 +254,7 @@ char	*s;
 }
 
 
+void
 quit(code)
 int  code;
 {
@@ -573,8 +568,8 @@ getmono()			/* get monochrome data */
 			cerr[x] = err + errp;
 		}
 	}
-	free((char *)inl);
-	free((char *)cerr);
+	free((void *)inl);
+	free((void *)cerr);
 }
 
 
@@ -602,7 +597,7 @@ colormap	cmap;
 			xr->cdefs[xr->ncolors].pixel = *p;
 			xr->pmap[*p] = xr->ncolors++;
 		}
-	xr->cdefs = (Color *)realloc((char *)xr->cdefs, xr->ncolors*sizeof(Color));
+	xr->cdefs = (Color *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(Color));
 	if (xr->cdefs == NULL)
 		return(0);
 	return(1);