--- ray/src/hd/rhdisp.c	1999/03/04 10:14:52	3.40
+++ ray/src/hd/rhdisp.c	2003/04/23 00:52:33	3.44
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhdisp.c,v 3.44 2003/04/23 00:52:33 greg Exp $";
 #endif
-
 /*
  * Holodeck display process.
  */
@@ -22,6 +19,14 @@ static char SCCSid[] = "$SunId$ SGI";
 #define FSIZDEF		0.125	/* default focus frame size */
 #endif
 
+#if defined(freebsd)
+#define fbufcnt(f)	((f)->_r)
+#elif defined(__GNUC__)
+#define fbufcnt(f)	((f)->_IO_read_end - (f)->_IO_read_ptr)
+#else
+#define fbufcnt(f)	((f)->_cnt)
+#endif
+
 HOLO	*hdlist[HDMAX+1];	/* global holodeck list */
 
 char	*hdgfn[HDMAX];		/* holodeck section geometry list */
@@ -40,7 +45,6 @@ char	*progname;		/* global argv[0] */
 FILE	*sstdin, *sstdout;	/* server's standard input and output */
 
 #ifdef DEBUG
-#include <sys/types.h>
 extern time_t	time();
 static time_t	tmodesw;
 static time_t	timm, tadd;
@@ -56,7 +60,6 @@ main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	extern int	eputs();
 	int	rdy, inp, res = 0, pause = 0;
 
 	progname = argv[0];
@@ -158,9 +161,9 @@ disp_wait()			/* wait for more input */
 	if (hdlist[0] == NULL)
 		return(RDY_SRV);	/* initialize first */
 	flgs = 0;		/* flag what's ready already */
-	if (imm_mode || stdin->_cnt > 0)
+	if (imm_mode || fbufcnt(stdin) > 0)
 		flgs |= RDY_SRV;
-	if (sstdin != NULL && sstdin->_cnt > 0)
+	if (sstdin != NULL && fbufcnt(sstdin) > 0)
 		flgs |= RDY_SIN;
 	if (odev.inpready)
 		flgs |= RDY_DEV;
@@ -476,7 +479,8 @@ serv_result()			/* get next server result and process 
 			if (buf == NULL)
 				buf = (char *)malloc(bufsiz=msg.nbytes);
 			else
-				buf = (char *)realloc(buf, bufsiz=msg.nbytes);
+				buf = (char *)realloc((void *)buf,
+						bufsiz=msg.nbytes);
 			if (buf == NULL)
 				error(SYSTEM, "out of memory in serv_result");
 		}
@@ -563,6 +567,7 @@ char	*p;
 }
 
 
+void
 eputs(s)			/* put error message to stderr */
 register char  *s;
 {
@@ -582,6 +587,7 @@ register char  *s;
 }
 
 
+void
 quit(code)			/* clean up and exit */
 int	code;
 {