--- ray/src/common/fvect.h	2003/02/25 02:47:21	2.8
+++ ray/src/common/fvect.h	2003/09/16 06:30:20	2.12
@@ -1,20 +1,23 @@
-/* RCSid $Id: fvect.h,v 2.8 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: fvect.h,v 2.12 2003/09/16 06:30:20 greg Exp $ */
 /*
  * Declarations for floating-point vector operations.
  */
+#ifndef _RAD_FVECT_H_
+#define _RAD_FVECT_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #ifdef  SMLFLT
-#define  FLOAT		float
+#define  RREAL		float
 #define  FTINY		(1e-3)
 #else
-#define  FLOAT		double
+#define  RREAL		double
 #define  FTINY		(1e-6)
 #endif
 #define  FHUGE		(1e10)
 
-typedef FLOAT  FVECT[3];
+typedef RREAL  FVECT[3];
 
 #define  VCOPY(v1,v2)	((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
 #define  DOT(v1,v2)	((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
@@ -33,13 +36,7 @@ typedef FLOAT  FVECT[3];
 			(vr)[1]=(v1)[2]*(v2)[0]-(v1)[0]*(v2)[2], \
 			(vr)[2]=(v1)[0]*(v2)[1]-(v1)[1]*(v2)[0])
 
-#ifdef NOPROTO
 
-extern double  fdot(), dist2(), dist2lseg(), dist2line(), normalize();
-extern void  fcross(), fvsum(), spinvector();
-
-#else
-
 extern double	fdot(FVECT v1, FVECT v2);
 extern double	dist2(FVECT v1, FVECT v2);
 extern double	dist2line(FVECT p, FVECT ep1, FVECT ep2);
@@ -47,6 +44,13 @@ extern double	dist2lseg(FVECT p, FVECT ep1, FVECT ep2)
 extern void	fcross(FVECT vres, FVECT v1, FVECT v2);
 extern void	fvsum(FVECT vres, FVECT v0, FVECT v1, double f);
 extern double	normalize(FVECT v);
+extern int	closestapproach(RREAL t[2], FVECT rorg0, FVECT rdir0,
+				FVECT rorg1, FVECT rdir1);
 extern void	spinvector(FVECT vres, FVECT vorig, FVECT vnorm, double theta);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_FVECT_H_ */
+