--- ray/src/common/plocate.h	2003/02/25 02:47:21	2.4
+++ ray/src/common/plocate.h	2003/06/27 06:53:21	2.7
@@ -1,12 +1,15 @@
-/* RCSid $Id: plocate.h,v 2.4 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: plocate.h,v 2.7 2003/06/27 06:53:21 greg Exp $ */
 /*
  *  plocate.h - header for 3D vector location.
  *
  *  Include after fvect.h
  */
+#ifndef _RAD_PLOCATE_H_
+#define _RAD_PLOCATE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 #define  EPSILON	FTINY		/* acceptable location error */
 
 #define  XPOS		03		/* x position mask */
@@ -18,16 +21,13 @@
 #define  BELOW		025		/* below bits */
 #define  ABOVE		052		/* above bits */
 
-#ifdef NOPROTO
 
-extern int	clip();
-
-extern int	plocate();
-
-#else
-
-extern int	clip(FLOAT *ep1, FLOAT *ep2, FVECT min, FVECT max);
-
+extern int	clip(RREAL *ep1, RREAL *ep2, FVECT min, FVECT max);
 extern int	plocate(FVECT p, FVECT min, FVECT max);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_PLOCATE_H_ */
+