--- ray/src/hd/rholo.h	2003/02/22 02:07:25	3.21
+++ ray/src/hd/rholo.h	2003/07/14 22:24:00	3.23
@@ -1,30 +1,36 @@
-/* RCSid: $Id: rholo.h,v 3.21 2003/02/22 02:07:25 greg Exp $ */
+/* RCSid: $Id: rholo.h,v 3.23 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  * Header file for rholo program
  */
+#ifndef _RAD_RHOLO_H_
+#define _RAD_RHOLO_H_
 
 #include "holo.h"
 #include "vars.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef RPACKSIZ
 #define RPACKSIZ	21		/* good packet size */
 #endif
 
 typedef struct packet {
-	int2	hd;		/* holodeck section (first) */
-	int4	bi;		/* beam index (second) */
-	int4	nr;		/* number of rays (third) */
-	int4	nc;		/* number calculated (fourth) */
+	int16	hd;		/* holodeck section (first) */
+	int32	bi;		/* beam index (second) */
+	int32	nr;		/* number of rays (third) */
+	int32	nc;		/* number calculated (fourth) */
 	RAYVAL	ra[RPACKSIZ];	/* ray values (fifth) */
 	float	*offset;	/* offset array if !vbool(OBSTRUCTIONS) */
 	struct packet	*next;	/* next in packet list */
 } PACKET;		/* a beam packet */
 
 typedef struct {
-	int2	hd;		/* holodeck section (first) */
-	int4	bi;		/* beam index (second) */
-	int4	nr;		/* number of rays (third) */
-	int4	nc;		/* number calculated (fourth) */
+	int16	hd;		/* holodeck section (first) */
+	int32	bi;		/* beam index (second) */
+	int32	nr;		/* number of rays (third) */
+	int32	nc;		/* number calculated (fourth) */
 } PACKHEAD;		/* followed by ray values */
 
 #define packsiz(nr)	(sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL))
@@ -113,4 +119,11 @@ extern char	*rtargv[];
 
 extern PACKET	*do_packets(), *get_packets(), *flush_queue();
 
-extern int2	*viewbeams();
+extern int16	*viewbeams();
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_RHOLO_H_ */
+