--- ray/src/common/cone.h	2003/02/25 02:47:21	2.3
+++ ray/src/common/cone.h	2003/11/14 17:22:06	2.7
@@ -1,4 +1,4 @@
-/* RCSid $Id: cone.h,v 2.3 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: cone.h,v 2.7 2003/11/14 17:22:06 schorsch Exp $ */
 /*
  *  cone.h - header file for cones (cones, cylinders, rings, cups, tubes).
  *
@@ -9,34 +9,35 @@
  *
  *     2/12/86
  */
+#ifndef _RAD_CONE_H_
+#define _RAD_CONE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 typedef struct cone {
-	FLOAT  *ca;		/* cone arguments (o->oargs.farg) */
+	RREAL  *ca;		/* cone arguments (o->oargs.farg) */
 	char  p0, p1;		/* indices for endpoints */
 	char  r0, r1;		/* indices for radii */
 	FVECT  ad;		/* axis direction vector */
-	FLOAT  al;		/* axis length */
-	FLOAT  sl;		/* side length */
-	FLOAT  (*tm)[4];	/* pointer to transformation matrix */
+	RREAL  al;		/* axis length */
+	RREAL  sl;		/* side length */
+	RREAL  (*tm)[4];	/* pointer to transformation matrix */
 }  CONE;
 
-#define  CO_R0(co)	((co)->ca[(co)->r0])
-#define  CO_R1(co)	((co)->ca[(co)->r1])
+#define  CO_R0(co)	((co)->ca[(int)((co)->r0)])
+#define  CO_R1(co)	((co)->ca[(int)((co)->r1)])
 #define  CO_P0(co)	((co)->ca+(co)->p0)
 #define  CO_P1(co)	((co)->ca+(co)->p1)
 
-#ifdef NOPROTO
 
-extern CONE  *getcone();
-extern void  freecone();
-extern void  conexform();
-
-#else
-
 extern CONE  *getcone(OBJREC *o, int getxf);
 extern void  freecone(OBJREC *o);
 extern void  conexform(CONE *co);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_CONE_H_ */
+