--- ray/src/ot/cvmesh.h	2003/06/07 00:56:31	2.3
+++ ray/src/ot/cvmesh.h	2003/07/14 22:24:00	2.5
@@ -1,4 +1,4 @@
-/* RCSid $Id: cvmesh.h,v 2.3 2003/06/07 00:56:31 schorsch Exp $ */
+/* RCSid $Id: cvmesh.h,v 2.5 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  *  Header for Radiance triangle mesh conversion
  *
@@ -6,14 +6,15 @@
  */
 #ifndef _RAD_CVMESH_H_
 #define _RAD_CVMESH_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include "octree.h"
 #include "object.h"
 #include "mesh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern MESH	*ourmesh;		/* global mesh pointer */
 
 extern FVECT	meshbounds[2];		/* mesh bounding box */
@@ -21,10 +22,10 @@ extern FVECT	meshbounds[2];		/* mesh bounding box */
 
 extern MESH	*cvinit(char *nm);
 extern int	cvpoly(OBJECT mo, int n, FVECT *vp,
-				FVECT *vn, FLOAT (*vc)[2]);
+				FVECT *vn, RREAL (*vc)[2]);
 extern int	cvtri(OBJECT mo, FVECT vp1, FVECT vp2, FVECT vp3,
 			FVECT vn1, FVECT vn2, FVECT vn3,
-			FLOAT vc1[2], FLOAT vc2[2], FLOAT vc3[2]);
+			RREAL vc1[2], RREAL vc2[2], RREAL vc3[2]);
 extern void	cvmeshbounds(void);
 extern MESH	*cvmesh(void);
 					/* defined in wfconv.c */