--- ray/src/common/face.h	2003/02/25 02:47:21	2.3
+++ ray/src/common/face.h	2003/06/27 06:53:21	2.6
@@ -1,31 +1,32 @@
-/* RCSid $Id: face.h,v 2.3 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: face.h,v 2.6 2003/06/27 06:53:21 greg Exp $ */
 /*
  *  face.h - header for routines using polygonal faces.
  */
+#ifndef _RAD_FACE_H_
+#define _RAD_FACE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #define  VERTEX(f,n)	((f)->va + 3*(n))
 
 typedef struct {	/* a polygonal face */
 	FVECT  norm;		/* the plane's unit normal */
-	FLOAT  offset;		/* plane equation:  DOT(norm, v) == offset */
-	FLOAT  area;		/* area of face */
-	FLOAT  *va;		/* vertex array (o->oargs.farg) */
+	RREAL  offset;		/* plane equation:  DOT(norm, v) == offset */
+	RREAL  area;		/* area of face */
+	RREAL  *va;		/* vertex array (o->oargs.farg) */
 	short  nv;		/* # of vertices */
 	short  ax;		/* axis closest to normal */
 } FACE;
 
-#ifdef NOPROTO
 
-extern FACE  *getface();
-extern void  freeface();
-extern int  inface();
-
-#else
-
 extern FACE  *getface(OBJREC *o);
 extern void  freeface(OBJREC *o);
 extern int  inface(FVECT p, FACE *f);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_FACE_H_ */
+