--- ray/src/hd/rhd_qtree.h	1998/08/17 17:59:59	3.11
+++ ray/src/hd/rhd_qtree.h	2003/07/14 22:24:00	3.16
@@ -1,15 +1,18 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid $Id: rhd_qtree.h,v 3.16 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  * Quadtree data structures for holodeck display drivers.
  */
+#ifndef _RAD_RHD_QTREE_H_
+#define _RAD_RHD_QTREE_H_
 
 #include "color.h"
 #include "tonemap.h"
 #include "rhdriver.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define	DL		0		/* down left */
 #define	DR		1		/* down right */
 #define	UL		2		/* up left */
@@ -34,7 +37,7 @@ typedef struct rtree {
 
 extern struct rleaves {
 	float		(*wp)[3];	/* world intersection point array */
-	int4		*wd;		/* world direction array */
+	int32		*wd;		/* world direction array */
 	TMbright	*brt;		/* encoded brightness array */
 	BYTE		(*chr)[3];	/* encoded chrominance array */
 	BYTE		(*rgb)[3];	/* tone-mapped color array */
@@ -52,5 +55,11 @@ extern int	qtMinNodesiz;	/* minimum node dimension (pi
 
 extern int	rayqleft;	/* number of rays to queue before flush */
 
-extern int4	encodedir();
+extern int32	encodedir();
 extern double	fdir2diff(), dir2diff();
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_RHD_QTREE_H_ */
+