--- ray/src/px/pcomb.c	2003/06/08 12:03:10	2.24
+++ ray/src/px/pcomb.c	2003/10/22 02:06:35	2.28
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcomb.c,v 2.24 2003/06/08 12:03:10 schorsch Exp $";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.28 2003/10/22 02:06:35 greg Exp $";
 #endif
 /*
  *  Combine picture files according to calcomp functions.
@@ -7,8 +7,8 @@ static const char	RCSid[] = "$Id: pcomb.c,v 2.24 2003/
  *	1/4/89
  */
 
-#include "standard.h"
 #include "platform.h"
+#include "standard.h"
 #include "color.h"
 #include "calcomp.h"
 #include "view.h"
@@ -109,7 +109,7 @@ char	*argv[];
 	for (nfiles = 0; nfiles < MAXINP; nfiles++) {
 		setcolor(input[nfiles].coef, 1.0, 1.0, 1.0);
 		setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
-		copystruct(&input[nfiles].vw, &stdview);
+		input[nfiles].vw = stdview;
 		input[nfiles].pa = 1.0;
 	}
 	nfiles = 0;
@@ -312,7 +312,8 @@ double	(*ourbright)() = rgb_bright;
 
 init()					/* perform final setup */
 {
-	double	l_colin(), l_expos(), l_pixaspect(), l_ray(), l_psize();
+	double	l_colin(char *), l_expos(char *), l_pixaspect(char *),
+			l_ray(char *), l_psize(char *);
 	register int	i;
 						/* define constants */
 	varset("PI", ':', PI);
@@ -446,7 +447,7 @@ register char	*nam;
 
 
 double
-l_pixaspect()			/* return pixel aspect ratio */
+l_pixaspect(char *nm)		/* return pixel aspect ratio */
 {
 	register int	fn;
 
@@ -518,7 +519,7 @@ register char	*nam;
 	static unsigned long	ltick[MAXINP];
 	static FVECT	lorg[MAXINP], ldir[MAXINP];
 	static double	ldist[MAXINP];
-	FLOAT	loc[2];
+	RREAL	loc[2];
 	int	fn;
 	register int	i;
 
@@ -551,12 +552,12 @@ register char	*nam;
 
 
 double
-l_psize()			/* compute pixel size in steradians */
+l_psize(char *nm)		/* compute pixel size in steradians */
 {
 	static unsigned long	ltick[MAXINP];
 	static double	psize[MAXINP];
 	FVECT	dir0, org, dirx, diry;
-	FLOAT	locx[2], locy[2];
+	RREAL	locx[2], locy[2];
 	double	d;
 	int	fn;
 	register int	i;