--- ray/src/ot/cvmesh.h	2003/03/11 17:08:55	2.1
+++ ray/src/ot/cvmesh.h	2003/07/14 22:24:00	2.5
@@ -1,34 +1,39 @@
-/* RCSid $Id: cvmesh.h,v 2.1 2003/03/11 17:08:55 greg Exp $ */
+/* RCSid $Id: cvmesh.h,v 2.5 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  *  Header for Radiance triangle mesh conversion
  *
  *  Include after standard.h
  */
+#ifndef _RAD_CVMESH_H_
+#define _RAD_CVMESH_H_
 
 #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 */
 
-#ifdef NOPROTO
 
-extern MESH	*cvinit();
-extern int	cvpoly();
-extern int	cvtri();
-extern void	cvmeshbounds();
-extern MESH	*cvmesh();
-
-#else
-
 extern MESH	*cvinit(char *nm);
-extern int	cvpoly(int n, FVECT *vp, FVECT *vn, FLOAT (*vc)[2]);
-extern int	cvtri(FVECT vp1, FVECT vp2, FVECT vp3,
+extern int	cvpoly(OBJECT mo, int n, FVECT *vp,
+				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 */
+void		wfreadobj(char *objfn);
 
-#endif /* NOPROTO */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_CVMESH_H_ */
+