--- ray/src/px/pcomb.c	2003/07/21 22:30:18	2.26
+++ ray/src/px/pcomb.c	2003/10/27 10:24:51	2.29
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcomb.c,v 2.26 2003/07/21 22:30:18 schorsch Exp $";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.29 2003/10/27 10:24:51 schorsch Exp $";
 #endif
 /*
  *  Combine picture files according to calcomp functions.
@@ -7,8 +7,9 @@ static const char	RCSid[] = "$Id: pcomb.c,v 2.26 2003/
  *	1/4/89
  */
 
-#include "standard.h"
 #include "platform.h"
+#include "rtprocess.h"
+#include "rterror.h"
 #include "color.h"
 #include "calcomp.h"
 #include "view.h"
@@ -69,7 +70,6 @@ char	*progname;			/* global argv[0] */
 int	wrongformat = 0;
 int	gotview;
 
-FILE	*popen();
 
 extern char	*emalloc();
 
@@ -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;
 
@@ -551,7 +552,7 @@ 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];
@@ -596,26 +597,23 @@ l_psize()			/* compute pixel size in steradians */
 }
 
 
-void
-wputs(msg)
-char	*msg;
+extern void
+wputs(char	*msg)
 {
 	if (!nowarn)
 		eputs(msg);
 }
 
 
-void
-eputs(msg)
-char	*msg;
+extern void
+eputs(char *msg)
 {
 	fputs(msg, stderr);
 }
 
 
-void
-quit(code)		/* exit gracefully */
-int  code;
+extern void
+quit(int code)		/* exit gracefully */
 {
 	register int  i;
 				/* close input files */