--- ray/src/common/cone.h	1991/10/23 12:19:24	1.2
+++ ray/src/common/cone.h	2003/06/26 00:58:09	2.5
@@ -1,7 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: cone.h,v 2.5 2003/06/26 00:58:09 schorsch Exp $ */
 /*
  *  cone.h - header file for cones (cones, cylinders, rings, cups, tubes).
  *
@@ -12,15 +9,22 @@
  *
  *     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])
@@ -28,4 +32,14 @@ typedef struct cone {
 #define  CO_P0(co)	((co)->ca+(co)->p0)
 #define  CO_P1(co)	((co)->ca+(co)->p1)
 
-extern CONE  *getcone();
+
+extern CONE  *getcone(OBJREC *o, int getxf);
+extern void  freecone(OBJREC *o);
+extern void  conexform(CONE *co);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_CONE_H_ */
+