--- ray/src/rt/renderopts.c	2003/02/25 02:47:23	2.2
+++ ray/src/rt/renderopts.c	2004/03/30 20:40:04	2.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: renderopts.c,v 2.2 2003/02/25 02:47:23 greg Exp $";
+static const char	RCSid[] = "$Id: renderopts.c,v 2.5 2004/03/30 20:40:04 greg Exp $";
 #endif
 /*
  *  renderopts.c - process common rendering options
@@ -10,12 +10,14 @@ static const char	RCSid[] = "$Id: renderopts.c,v 2.2 2
 #include "copyright.h"
 
 #include  "ray.h"
+#include  "paths.h"
 
 
-int
-getrenderopt(ac, av)		/* get next render option */
-int  ac;
-char  *av[];
+extern int
+getrenderopt(		/* get next render option */
+	int  ac,
+	char  *av[]
+)
 {
 #define	 check(ol,al)		if (av[0][ol] || \
 				badarg(ac-1,av+1,al)) \
@@ -139,7 +141,7 @@ char  *av[];
 			}
 			if (av[0][2] == 'I') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
 			"cannot open ambient include file \"%s\"", av[0]);
@@ -160,7 +162,7 @@ char  *av[];
 			}
 			if (av[0][2] == 'E') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
 			"cannot open ambient exclude file \"%s\"", av[0]);
@@ -210,11 +212,9 @@ char  *av[];
 }
 
 
-void
-print_rdefaults()		/* print default render values to stdout */
+extern void
+print_rdefaults(void)		/* print default render values to stdout */
 {
-	register char  *cp;
-
 	printf(do_irrad ? "-i+\t\t\t\t# irradiance calculation on\n" :
 			"-i-\t\t\t\t# irradiance calculation off\n");
 	printf(backvis ? "-bv+\t\t\t\t# back face visibility on\n" :