--- ray/src/common/lamps.c	1993/08/23 10:12:43	2.3
+++ ray/src/common/lamps.c	2003/02/25 02:47:21	2.7
@@ -1,18 +1,19 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: lamps.c,v 2.7 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
  * Load lamp data.
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
+#include  <stdlib.h>
 #include  <ctype.h>
+#include  "color.h"
 
-extern char	*eindex(), *expsave(), *malloc();
-extern FILE	*fropen();
+extern char	*eindex(), *expsave();
+extern FILE	*frlibopen();
 
 typedef struct lamp {
 	char	*pattern;			/* search pattern */
@@ -48,7 +49,7 @@ char	*file;
 	char	buf[128], str[128];
 	register char	*cp1, *cp2;
 
-	if ((fp = fropen(file)) == NULL)
+	if ((fp = frlibopen(file)) == NULL)
 		return(0);
 	lastp = NULL;
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
@@ -135,10 +136,10 @@ freelamps()			/* free our lamps list */
 			for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next)
 				if (lp2->color == lp1->color)
 					lp2->color = NULL;
-			free((char *)lp1->color);
+			free((void *)lp1->color);
 		}
 		lp2 = lp1->next;
-		free((char *)lp1);
+		free((void *)lp1);
 	}
 	lamps = NULL;
 }