--- ray/src/px/warp3d.c	1998/09/02 18:41:44	3.4
+++ ray/src/px/warp3d.c	2003/02/22 02:07:28	3.5
@@ -1,14 +1,12 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: warp3d.c,v 3.5 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  * 3D warping routines.
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include "fvect.h"
 #include "warp3d.h"
@@ -25,12 +23,7 @@ typedef struct {
 
 #define AHUNK	24		/* number of points to allocate at a time */
 
-#ifndef malloc
-extern char	*malloc(), *realloc();
-#endif
-extern void	free();
 
-
 double
 wpdist2(p1, p2)			/* compute square of distance between points */
 register W3VEC	p1, p2;
@@ -328,9 +321,9 @@ free3dw(wp)			/* free WARP3D data */
 register WARP3D	*wp;
 {
 	done3dgrid(&wp->grid);
-	free((char *)wp->ip);
-	free((char *)wp->ov);
-	free((char *)wp);
+	free((void *)wp->ip);
+	free((void *)wp->ov);
+	free((void *)wp);
 }