--- ray/src/common/rglmat.c	1998/06/09 11:18:35	3.1
+++ ray/src/common/rglmat.c	2003/02/25 02:47:22	3.3
@@ -1,22 +1,20 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglmat.c,v 3.3 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  * Routines for Radiance -> OpenGL materials.
  */
 
+#include "copyright.h"
+
 #include "radogl.h"
 
-extern int	free(), freemtl();
-
 int	domats = 1;			/* are we doing materials? */
 
 LUTAB	mtab = LU_SINIT(free,freemtl);
 
 
+void
 rgl_matclear()			/* clean up materials */
 {
 	lu_done(&mtab);
@@ -38,6 +36,7 @@ char	*nam;
 }
 
 
+int
 o_default(o)			/* default object is non-material modifier */
 register OBJREC	*o;
 {
@@ -55,7 +54,7 @@ register OBJREC	*o;
 			goto memerr;
 		strcpy(lup->key, o->oname);
 	} else if (lup->data != NULL)
-		freemtl(lup->data);
+		freemtl((MATREC *)lup->data);
 	if ((lup->data = o->os) != NULL)	/* make material reference */
 		((MATREC *)lup->data)->nlinks++;
 	return;
@@ -78,7 +77,7 @@ char	*nam;
 			goto memerr;
 		strcpy(lup->key, nam);
 	} else if (lup->data != NULL)
-		freemtl(lup->data);
+		freemtl((MATREC *)lup->data);
 	lup->data = (char *)malloc(sizeof(MATREC));
 	if (lup->data == NULL)
 		goto memerr;
@@ -89,14 +88,16 @@ memerr:
 }
 
 
+void
 freemtl(mp)			/* free a material */
 register MATREC	*mp;
 {
 	if (!--mp->nlinks)
-		free((char *)mp);
+		free((void *)mp);
 }
 
 
+int
 m_normal(o)			/* compute normal material parameters */
 register OBJREC	*o;
 {
@@ -128,6 +129,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_aniso(o)			/* anisotropic material */
 register OBJREC	*o;
 {
@@ -159,6 +161,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_glass(o)			/* glass material (hopeless) */
 OBJREC	*o;
 {
@@ -172,6 +175,7 @@ OBJREC	*o;
 }
 
 
+int
 m_brdf(o)			/* convert functional material */
 register OBJREC	*o;
 {
@@ -198,6 +202,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_brdf2(o)			/* convert advanced functional material */
 register OBJREC	*o;
 {
@@ -217,6 +222,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_light(o)			/* convert light type */
 register OBJREC	*o;
 {
@@ -245,6 +251,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_mirror(o)			/* convert mirror type */
 register OBJREC	*o;
 {
@@ -261,6 +268,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_prism(o)			/* convert prism type */
 register OBJREC	*o;
 {