--- ray/src/hd/rhdisp.h	1998/11/24 17:05:35	3.12
+++ ray/src/hd/rhdisp.h	2003/07/14 22:24:00	3.15
@@ -1,11 +1,14 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid: $Id: rhdisp.h,v 3.15 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  * Header for holodeck display drivers.
  */
+#ifndef _RAD_RHDISP_H_
+#define _RAD_RHDISP_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 				/* display requests */
 #define DR_NOOP		0		/* to release from vain DR_ATTEN */
 #define DR_BUNDLE	1		/* lone bundle request */
@@ -45,8 +48,8 @@
 #endif
 
 typedef struct {
-	int2	type;		/* message type */
-	int4	nbytes;		/* number of additional bytes */
+	int16	type;		/* message type */
+	int32	nbytes;		/* number of additional bytes */
 } MSGHEAD;		/* message head */
 
 /*
@@ -62,3 +65,9 @@ typedef struct {
  * The standard output will always be available for writing, though it
  * may go to /dev/null.
  */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_RHDISP_H_ */
+