--- ray/src/common/view.h	2003/02/25 02:47:22	2.8
+++ ray/src/common/view.h	2003/06/30 19:04:29	2.12
@@ -1,13 +1,16 @@
-/* RCSid $Id: view.h,v 2.8 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: view.h,v 2.12 2003/06/30 19:04:29 greg Exp $ */
 /*
  *  view.h - header file for image generation.
  *
- *  Include after fvect.h
+ *  Include after stdio.h and fvect.h
  *  Includes resolu.h
  */
+#ifndef _RAD_VIEW_H_
+#define _RAD_VIEW_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #include  "resolu.h"
 
 				/* view types */
@@ -45,28 +48,12 @@ extern VIEW  stdview;
 #define  VIEWSTR	"VIEW="
 #define  VIEWSTRL	5
 
-#ifdef NOPROTO
 
-extern char	*setview();
-extern void	normaspect();
-extern double	viewray();
-extern void	viewloc();
-extern void	pix2loc();
-extern void	loc2pix();
-extern int	getviewopt();
-extern int	sscanview();
-extern void	fprintview();
-extern char	*viewopt();
-extern int	isview();
-extern int	viewfile();
-
-#else
-
 extern char	*setview(VIEW *v);
 extern void	normaspect(double va, double *ap, int *xp, int *yp);
 extern double	viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
 extern void	viewloc(FVECT ip, VIEW *v, FVECT p);
-extern void	pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
+extern void	pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
 extern void	loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
 extern int	getviewopt(VIEW *v, int ac, char *av[]);
 extern int	sscanview(VIEW *vp, char *s);
@@ -75,4 +62,9 @@ extern char	*viewopt(VIEW *vp);
 extern int	isview(char *s);
 extern int	viewfile(char *fname, VIEW *vp, RESOLU *rp);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_VIEW_H_ */
+